Merge "Fix Bug 3663: Update netvirt.impl UT"

[netvirt.git] / openstack / net-virt / src / test / java / org / opendaylight / ovsdb / openstack / netvirt / AbstractHandlerTest.java

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandlerTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandlerTest.java
index 468920a41188a59926fc1eaa7b23b677dd121cad..7897b161a6dcc5e58d82a3e257b5a9e687cad7cf 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandlerTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandlerTest.java
@@ -13,22 +13,30 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import java.net.HttpURLConnection;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
-import org.opendaylight.ovsdb.plugin.api.Status;
-import org.opendaylight.ovsdb.plugin.api.StatusCode;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Status;
+import org.opendaylight.ovsdb.openstack.netvirt.api.StatusCode;
 /**
  * Unit test for {@link AbstractHandler}
  */
+@RunWith(MockitoJUnitRunner.class)
 public class AbstractHandlerTest {
 
+    @InjectMocks private AbstractHandler abstractHandler = mock(AbstractHandler.class, Mockito.CALLS_REAL_METHODS);
+    @Mock private EventDispatcher eventDispatcher;
+
     @Test
-    public void testAbstractHandler() {
+    public void testGetException() {
         Status status = mock(Status.class);
 
         when(status.getCode())
@@ -61,11 +69,8 @@ public class AbstractHandlerTest {
     }
 
     @Test
-    public void testEnqueueEvent(){
-        EventDispatcher eventDispatcher = mock(EventDispatcher.class);
-
-        verifyNoMoreInteractions(eventDispatcher);
-        eventDispatcher.enqueueEvent(mock(AbstractEvent.class));
+    public void testEnqueueEvent() throws Exception {
+        abstractHandler.enqueueEvent(mock(AbstractEvent.class));
         verify(eventDispatcher, times(1)).enqueueEvent(any(AbstractEvent.class));
     }
 }