X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FModuleFactoryBundleTrackerTest.java;fp=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FModuleFactoryBundleTrackerTest.java;h=da585b7151365eec3529161530403371f0016283;hb=0fdfbf0687003d0ef5353ea82ae8e1c7ed97b5c3;hp=9ac570e2eed166045ac7930425b77932b5229263;hpb=493c4f70a0a315d77927e4c0d90a90acbbcb2897;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTrackerTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTrackerTest.java index 9ac570e2ee..da585b7151 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTrackerTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTrackerTest.java @@ -18,6 +18,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import java.util.Collection; @@ -134,7 +135,7 @@ public class ModuleFactoryBundleTrackerTest { public void testBundleAddAndRemove() throws Exception { final ModuleFactoryBundleTracker tracker = new ModuleFactoryBundleTracker(blankTxTracker); doReturn(getClass().getResource("/module-factories/module-factory-ok")).when(bundle).getEntry(anyString()); - tracker.addingBundle(bundle, mock(BundleEvent.class)); + tracker.addingBundle(bundle, null); Collection> entries = tracker.getModuleFactoryEntries(); assertNotNull(entries); @@ -145,13 +146,23 @@ public class ModuleFactoryBundleTrackerTest { doNothing().when(blankTxTracker).blankTransaction();; - tracker.removedBundle(bundle, mock(BundleEvent.class), bundle); + BundleEvent mockEvent = mock(BundleEvent.class); + doReturn(BundleEvent.STOPPING).when(mockEvent).getType(); + + tracker.removedBundle(bundle, mockEvent, bundle); entries = tracker.getModuleFactoryEntries(); assertNotNull(entries); assertEquals(0, entries.size()); - verify(blankTxTracker).blankTransaction();; + verify(blankTxTracker).blankTransaction(); + + reset(mockEvent); + doReturn(BundleEvent.STOPPED).when(mockEvent).getType(); + + tracker.addingBundle(bundle, mockEvent); + + assertEquals(0, tracker.getModuleFactoryEntries().size()); } @Test