X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FBlankTransactionServiceTrackerTest.java;h=7d426be66289e5a6b58b01702a9e17746c385255;hp=8ceee0caf5596b798371436f0f81fc9c2294febc;hb=0e74e5866c506da072cae3a2897335df7170f958;hpb=e316a0ef36279a72767703d190f38a39d7d49395

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTrackerTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTrackerTest.java
index 8ceee0caf5..7d426be662 100644
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTrackerTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTrackerTest.java
@@ -1,13 +1,20 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.manager.impl.osgi;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collections;
 import javax.management.ObjectName;
 import org.junit.Before;
@@ -22,7 +29,6 @@ import org.opendaylight.controller.config.spi.ModuleFactory;
 import org.osgi.framework.ServiceReference;
 
 public class BlankTransactionServiceTrackerTest {
-
     @Mock
     private BlankTransactionServiceTracker.BlankTransaction blankTx;
     private BlankTransactionServiceTracker tracker;
@@ -30,8 +36,9 @@ public class BlankTransactionServiceTrackerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        doReturn(new CommitStatus(Collections.<ObjectName>emptyList(), Collections.<ObjectName>emptyList(), Collections.<ObjectName>emptyList())).when(blankTx).hit();
-        tracker = new BlankTransactionServiceTracker(blankTx);
+        doReturn(new CommitStatus(Collections.<ObjectName>emptyList(), Collections.<ObjectName>emptyList(),
+                Collections.<ObjectName>emptyList())).when(blankTx).hit();
+        tracker = new BlankTransactionServiceTracker(blankTx, 10, MoreExecutors.newDirectExecutorService());
     }
 
     @Test
@@ -47,36 +54,24 @@ public class BlankTransactionServiceTrackerTest {
         IllegalArgumentException argumentException = new IllegalArgumentException();
         ValidationException validationException = ValidationException.createForSingleException(new ModuleIdentifier("m", "i"), argumentException);
         doThrow(validationException).when(blankTx).hit();
-        try {
-            tracker.addingService(getMockServiceReference());
-        } catch (Exception e) {
-            verify(blankTx, times(1)).hit();
-            assertNotNull(e.getCause());
-            assertSame(validationException, e.getCause());
-            return;
-        }
 
-        fail("Exception should have occurred for validation exception");
+        tracker.addingService(getMockServiceReference());
+        verify(blankTx, times(10)).hit();
     }
 
     @Test
     public void testConflictingException() throws Exception {
         int maxAttempts = 2;
-        tracker = new BlankTransactionServiceTracker(blankTx, maxAttempts);
+        tracker = new BlankTransactionServiceTracker(blankTx, maxAttempts, MoreExecutors.newDirectExecutorService());
 
         final ConflictingVersionException ex = new ConflictingVersionException();
         doThrow(ex).when(blankTx).hit();
-        try {
-            tracker.addingService(getMockServiceReference());
-        } catch (Exception e) {
-            verify(blankTx, times(maxAttempts)).hit();
-            return;
-        }
 
-        fail("Exception should have occurred for conflicting exception");
+        tracker.addingService(getMockServiceReference());
+        verify(blankTx, times(maxAttempts)).hit();
     }
 
-    private ServiceReference<ModuleFactory> getMockServiceReference() {
+    private static ServiceReference<ModuleFactory> getMockServiceReference() {
         return mock(ServiceReference.class);
     }
 }