X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fl2switch%2Fimplementation%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsample%2Fl2switch%2Fmd%2Fflow%2FFlowWriterServiceImplTest.java;h=50f74cc33f99e40c91e3b2241c970ff650391928;hp=3520d812d7e1b0a2e591b28f69a29630b61df08b;hb=8ff71ab96c3c6b79954946b633284daa0628f564;hpb=02f34337b56b74def8fe59a7681c1012a58d4f04

diff --git a/opendaylight/md-sal/samples/l2switch/implementation/src/test/java/org/opendaylight/controller/sample/l2switch/md/flow/FlowWriterServiceImplTest.java b/opendaylight/md-sal/samples/l2switch/implementation/src/test/java/org/opendaylight/controller/sample/l2switch/md/flow/FlowWriterServiceImplTest.java
index 3520d812d7..50f74cc33f 100644
--- a/opendaylight/md-sal/samples/l2switch/implementation/src/test/java/org/opendaylight/controller/sample/l2switch/md/flow/FlowWriterServiceImplTest.java
+++ b/opendaylight/md-sal/samples/l2switch/implementation/src/test/java/org/opendaylight/controller/sample/l2switch/md/flow/FlowWriterServiceImplTest.java
@@ -7,11 +7,19 @@
  */
 package org.opendaylight.controller.sample.l2switch.md.flow;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.sample.l2switch.md.topology.NetworkGraphService;
 import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
+import org.opendaylight.controller.sample.l2switch.md.topology.NetworkGraphService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
@@ -23,128 +31,110 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  */
 public class FlowWriterServiceImplTest {
-  private DataBrokerService dataBrokerService;
-  private NodeConnectorRef srcNodeConnectorRef;
-  private NodeConnectorRef destNodeConnectorRef;
-  private MacAddress destMacAddress;
-  private MacAddress srcMacAddress;
-  private DataModificationTransaction dataModificationTransaction;
-  private NetworkGraphService networkGraphService;
+    private DataBrokerService dataBrokerService;
+    private NodeConnectorRef srcNodeConnectorRef;
+    private NodeConnectorRef destNodeConnectorRef;
+    private MacAddress destMacAddress;
+    private MacAddress srcMacAddress;
+    private DataModificationTransaction dataModificationTransaction;
+    private NetworkGraphService networkGraphService;
 
-  @Before
-  public void init() {
-    dataBrokerService = mock(DataBrokerService.class);
-    networkGraphService = mock(NetworkGraphService.class);
-    //build source node connector ref
-    InstanceIdentifier<Nodes> srcNodesInstanceIdentifier
-        = InstanceIdentifier.builder(Nodes.class)
-        .build();
-    InstanceIdentifier<Node> srcNodeInstanceIdentifier
-        = InstanceIdentifier.builder(srcNodesInstanceIdentifier)
-        .child(Node.class, new NodeKey(new NodeId("openflow:1")))
-        .build();
-    InstanceIdentifier<NodeConnector> srcNodeConnectorInstanceIdentifier
-        = InstanceIdentifier.builder(srcNodeInstanceIdentifier)
-        .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("openflow:1:2")))
-        .build();
-    srcNodeConnectorRef = new NodeConnectorRef(srcNodeConnectorInstanceIdentifier);
+    @Before
+    public void init() {
+        dataBrokerService = mock(DataBrokerService.class);
+        networkGraphService = mock(NetworkGraphService.class);
+        //build source node connector ref
+        InstanceIdentifier<Nodes> srcNodesInstanceIdentifier = InstanceIdentifier.create(Nodes.class);
+        InstanceIdentifier<Node> srcNodeInstanceIdentifier = srcNodesInstanceIdentifier
+                .child(Node.class, new NodeKey(new NodeId("openflow:1")));
+        InstanceIdentifier<NodeConnector> srcNodeConnectorInstanceIdentifier = srcNodeInstanceIdentifier
+                .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("openflow:1:2")));
+        srcNodeConnectorRef = new NodeConnectorRef(srcNodeConnectorInstanceIdentifier);
 
-    //build dest node connector ref
-    InstanceIdentifier<Nodes> nodesInstanceIdentifier
+        //build dest node connector ref
+        InstanceIdentifier<Nodes> nodesInstanceIdentifier
         = InstanceIdentifier.builder(Nodes.class)
         .build();
-    InstanceIdentifier<Node> nodeInstanceIdentifier
-        = InstanceIdentifier.builder(nodesInstanceIdentifier)
-        .child(Node.class, new NodeKey(new NodeId("openflow:2")))
-        .build();
-    InstanceIdentifier<NodeConnector> nodeConnectorInstanceIdentifier
-        = InstanceIdentifier.builder(nodeInstanceIdentifier)
-        .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("openflow:2:2")))
-        .build();
-    destNodeConnectorRef = new NodeConnectorRef(nodeConnectorInstanceIdentifier);
-    destMacAddress = new MacAddress("00:0a:95:9d:68:16");
-    srcMacAddress = new MacAddress("00:0a:95:8c:97:24");
-    dataModificationTransaction = mock(DataModificationTransaction.class);
-    when(dataBrokerService.beginTransaction()).thenReturn(dataModificationTransaction);
-  }
+        InstanceIdentifier<Node> nodeInstanceIdentifier =
+                nodesInstanceIdentifier.child(Node.class, new NodeKey(new NodeId("openflow:2")));
+        InstanceIdentifier<NodeConnector> nodeConnectorInstanceIdentifier =
+                nodeInstanceIdentifier.child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("openflow:2:2")));
+        destNodeConnectorRef = new NodeConnectorRef(nodeConnectorInstanceIdentifier);
+        destMacAddress = new MacAddress("00:0a:95:9d:68:16");
+        srcMacAddress = new MacAddress("00:0a:95:8c:97:24");
+        dataModificationTransaction = mock(DataModificationTransaction.class);
+        when(dataBrokerService.beginTransaction()).thenReturn(dataModificationTransaction);
+    }
 
-  @Test
-  public void testFlowWriterServiceImpl_NPEWhenDataBrokerServiceIsNull() throws Exception {
-    try {
-      new FlowWriterServiceImpl(null, networkGraphService);
-      fail("Expected null pointer exception.");
-    } catch(NullPointerException npe) {
-      assertEquals("dataBrokerService should not be null.", npe.getMessage());
+    @Test
+    public void testFlowWriterServiceImpl_NPEWhenDataBrokerServiceIsNull() throws Exception {
+        try {
+            new FlowWriterServiceImpl(null, networkGraphService);
+            fail("Expected null pointer exception.");
+        } catch(NullPointerException npe) {
+            assertEquals("dataBrokerService should not be null.", npe.getMessage());
+        }
     }
-  }
 
-  @Test
-  public void testAddMacToMacFlow_NPEWhenNullSourceMacDestMacAndNodeConnectorRef() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    try {
-      flowWriterService.addMacToMacFlow(null, null, null);
-      fail("Expected null pointer exception.");
-    } catch(NullPointerException npe) {
-      assertEquals("Destination mac address should not be null.", npe.getMessage());
+    @Test
+    public void testAddMacToMacFlow_NPEWhenNullSourceMacDestMacAndNodeConnectorRef() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        try {
+            flowWriterService.addMacToMacFlow(null, null, null);
+            fail("Expected null pointer exception.");
+        } catch(NullPointerException npe) {
+            assertEquals("Destination mac address should not be null.", npe.getMessage());
+        }
     }
-  }
 
-  @Test
-  public void testAddMacToMacFlow_NPEWhenSourceMacNullMac() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    try {
-      flowWriterService.addMacToMacFlow(null, null, destNodeConnectorRef);
-      fail("Expected null pointer exception.");
-    } catch(NullPointerException npe) {
-      assertEquals("Destination mac address should not be null.", npe.getMessage());
+    @Test
+    public void testAddMacToMacFlow_NPEWhenSourceMacNullMac() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        try {
+            flowWriterService.addMacToMacFlow(null, null, destNodeConnectorRef);
+            fail("Expected null pointer exception.");
+        } catch(NullPointerException npe) {
+            assertEquals("Destination mac address should not be null.", npe.getMessage());
+        }
     }
-  }
 
-  @Test
-  public void testAddMacToMacFlow_NPEWhenNullSourceMacNodeConnectorRef() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    try {
-      flowWriterService.addMacToMacFlow(null, destMacAddress, null);
-      fail("Expected null pointer exception.");
-    } catch(NullPointerException npe) {
-      assertEquals("Destination port should not be null.", npe.getMessage());
+    @Test
+    public void testAddMacToMacFlow_NPEWhenNullSourceMacNodeConnectorRef() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        try {
+            flowWriterService.addMacToMacFlow(null, destMacAddress, null);
+            fail("Expected null pointer exception.");
+        } catch(NullPointerException npe) {
+            assertEquals("Destination port should not be null.", npe.getMessage());
+        }
     }
-  }
 
-  @Test
-  public void testAddMacToMacFlow_WhenNullSourceMac() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    flowWriterService.addMacToMacFlow(null, destMacAddress, destNodeConnectorRef);
-    verify(dataBrokerService, times(1)).beginTransaction();
-    verify(dataModificationTransaction, times(1)).commit();
-  }
+    @Test
+    public void testAddMacToMacFlow_WhenNullSourceMac() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        flowWriterService.addMacToMacFlow(null, destMacAddress, destNodeConnectorRef);
+        verify(dataBrokerService, times(1)).beginTransaction();
+        verify(dataModificationTransaction, times(1)).commit();
+    }
 
-  @Test
-  public void testAddMacToMacFlow_WhenSrcAndDestMacAreSame() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    flowWriterService.addMacToMacFlow(new MacAddress(destMacAddress.getValue()), destMacAddress, destNodeConnectorRef);
-    verify(dataBrokerService, never()).beginTransaction();
-    verify(dataModificationTransaction, never()).commit();
+    @Test
+    public void testAddMacToMacFlow_WhenSrcAndDestMacAreSame() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        flowWriterService.addMacToMacFlow(new MacAddress(destMacAddress.getValue()), destMacAddress, destNodeConnectorRef);
+        verify(dataBrokerService, never()).beginTransaction();
+        verify(dataModificationTransaction, never()).commit();
 
-  }
+    }
 
-  @Test
-  public void testAddMacToMacFlow_SunnyDay() throws Exception {
-    FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
-    flowWriterService.addMacToMacFlow(srcMacAddress, destMacAddress, destNodeConnectorRef);
-    verify(dataBrokerService, times(1)).beginTransaction();
-    verify(dataModificationTransaction, times(1)).commit();
-  }
+    @Test
+    public void testAddMacToMacFlow_SunnyDay() throws Exception {
+        FlowWriterService flowWriterService = new FlowWriterServiceImpl(dataBrokerService, networkGraphService);
+        flowWriterService.addMacToMacFlow(srcMacAddress, destMacAddress, destNodeConnectorRef);
+        verify(dataBrokerService, times(1)).beginTransaction();
+        verify(dataModificationTransaction, times(1)).commit();
+    }
 
 }