Coverage - SalFlowServiceImpl.

Increase code coverage for class SalFlowServiceImpl.

Change-Id: I8234976c60858dbc25e90db569e90c96d325a52e
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImplTest.java
index 76e4433618a5e52e701269fc3dbebe8db4fc2920..5c4f0b385799d471d27613a817868f244d40e220 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImplTest.java
@@ -1,7 +1,14 @@
 package org.opendaylight.openflowplugin.impl.services;
 
 
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.openflowplugin.impl.registry.flow.DeviceFlowRegistryImpl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.*;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.flow.update.OriginalFlow;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.flow.update.UpdatedFlow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import junit.framework.TestCase;
 import org.junit.Test;
@@ -11,55 +18,93 @@ import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 
 import java.math.BigInteger;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@RunWith(MockitoJUnitRunner.class)
 public class SalFlowServiceImplTest extends TestCase {
 
     private static final BigInteger DUMMY_DATAPATH_ID = new BigInteger("444");
     private static final Short DUMMY_VERSION = OFConstants.OFP_VERSION_1_3;
 
-    @Test
-    public void testAddFlow() throws Exception {
-        RequestContextStack mockedRequestContextStack = mock(RequestContextStack.class);
-        DeviceContext mockedDeviceContext = mock(DeviceContext.class);
+    @Mock
+    RequestContextStack mockedRequestContextStack;
+    @Mock
+    DeviceContext mockedDeviceContext;
+    @Mock
+    ConnectionContext mockedPrimConnectionContext;
+    @Mock
+    FeaturesReply mockedFeatures;
+    @Mock
+    ConnectionAdapter mockedConnectionAdapter;
+    @Mock
+    MessageSpy mockedMessagSpy;
+
 
-        ConnectionContext mockedPrimConnectionContext = mock(ConnectionContext.class);
-        FeaturesReply mockedFeatures = mock(FeaturesReply.class);
+    @Before
+    public void initialization() {
         when(mockedFeatures.getDatapathId()).thenReturn(DUMMY_DATAPATH_ID);
         when(mockedFeatures.getVersion()).thenReturn(DUMMY_VERSION);
+
         when(mockedPrimConnectionContext.getFeatures()).thenReturn(mockedFeatures);
-        ConnectionAdapter mockedConnectionAdapter = mock(ConnectionAdapter.class);
         when(mockedPrimConnectionContext.getConnectionAdapter()).thenReturn(mockedConnectionAdapter);
+
         when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedPrimConnectionContext);
-        MessageSpy mockedMessagSpy = mock(MessageSpy.class);
+
         when(mockedDeviceContext.getMessageSpy()).thenReturn(mockedMessagSpy);
         when(mockedDeviceContext.getDeviceFlowRegistry()).thenReturn(new DeviceFlowRegistryImpl());
+    }
 
+    @Test
+    public void testAddFlow() throws Exception {
         final SalFlowServiceImpl salFlowService = new SalFlowServiceImpl(mockedRequestContextStack, mockedDeviceContext);
 
         AddFlowInput mockedAddFlowInput = mock(AddFlowInput.class);
         when(mockedAddFlowInput.getMatch()).thenReturn(mock(Match.class));
-        final Future<RpcResult<AddFlowOutput>> rpcResultFuture = salFlowService.addFlow(mockedAddFlowInput);
-        assertNotNull(rpcResultFuture);
-        final RpcResult<AddFlowOutput> addFlowOutputRpcResult = rpcResultFuture.get();
-        assertNotNull(addFlowOutputRpcResult);
-        assertTrue(addFlowOutputRpcResult.isSuccessful());
+
+        verifyOutput(salFlowService.addFlow(mockedAddFlowInput));
     }
 
+    @Test
     public void testRemoveFlow() throws Exception {
+        final SalFlowServiceImpl salFlowService = new SalFlowServiceImpl(mockedRequestContextStack, mockedDeviceContext);
 
+        RemoveFlowInput mockedRemoveFlowInput = mock(RemoveFlowInput.class);
+        verifyOutput(salFlowService.removeFlow(mockedRemoveFlowInput));
     }
 
+    @Test
     public void testUpdateFlow() throws Exception {
+        final SalFlowServiceImpl salFlowService = new SalFlowServiceImpl(mockedRequestContextStack, mockedDeviceContext);
+
+        UpdateFlowInput mockedUpdateFlowInput = mock(UpdateFlowInput.class);
+
+
+        UpdatedFlow mockedUpdateFlow = mock(UpdatedFlow.class);
+        when(mockedUpdateFlow.getMatch()).thenReturn(mock(Match.class));
+        when(mockedUpdateFlowInput.getUpdatedFlow()).thenReturn(mockedUpdateFlow);
 
+
+        OriginalFlow mockedOriginalFlow = mock(OriginalFlow.class);
+        when(mockedOriginalFlow.getMatch()).thenReturn(mock(Match.class));
+        when(mockedUpdateFlowInput.getOriginalFlow()).thenReturn(mockedOriginalFlow);
+
+        verifyOutput(salFlowService.updateFlow(mockedUpdateFlowInput));
+    }
+
+    private <T extends DataObject> void verifyOutput(Future<RpcResult<T>> rpcResultFuture) throws ExecutionException, InterruptedException {
+        assertNotNull(rpcResultFuture);
+        final RpcResult<?> addFlowOutputRpcResult = rpcResultFuture.get();
+        assertNotNull(addFlowOutputRpcResult);
+        assertTrue(addFlowOutputRpcResult.isSuccessful());
     }
 }
\ No newline at end of file