Use ByteBuf.readRetainedSlice()

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / util / NodeConnectorRefToPortTranslatorTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java
index 1afa39cb759e69f5958a44532e6207e30ac2d871..a750fa738519814501a96bf4b0685ce17637d46b 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java
@@ -8,14 +8,12 @@
 package org.opendaylight.openflowplugin.impl.util;
 
 import com.google.common.collect.Lists;
-import java.math.BigInteger;
 import junit.framework.TestCase;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowplugin.api.OFConstants;
-import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
@@ -28,22 +26,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketIn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessageBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
-/**
- * Created by Tomas Slusny on 24.3.2016.
- */
 @RunWith(MockitoJUnitRunner.class)
 public class NodeConnectorRefToPortTranslatorTest extends TestCase {
 
-    static final String PACKET_DATA = "Test_Data";
-    static final Long PORT_NO = 5l;
-    static final Long SECOND_PORT_NO = 6l;
-    static final BigInteger DATA_PATH_ID = BigInteger.TEN;
-    static final short OF_VERSION = OFConstants.OFP_VERSION_1_3;
-    static final String ID_VALUE = "openflow:" + DATA_PATH_ID;
-    static final Long TABLE_ID = 42L;
+    private static final String PACKET_DATA = "Test_Data";
+    private static final Uint32 PORT_NO = Uint32.valueOf(5L);
+    private static final Uint64 DATA_PATH_ID = Uint64.TEN;
+    private static final Uint8 OF_VERSION = OFConstants.OFP_VERSION_1_3;
+    private static final Uint32 TABLE_ID = Uint32.valueOf(42);
 
-    private static PacketIn createPacketIn(long portNo) {
+    private static PacketIn createPacketIn(final Uint32 portNo) {
         InPortBuilder inPortBuilder = new InPortBuilder()
                 .setPortNumber(new PortNumber(portNo));
 
@@ -51,8 +47,8 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase {
                 .setInPort(inPortBuilder.build());
 
         MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder()
-                .setOxmClass(OpenflowBasicClass.class)
-                .setOxmMatchField(InPort.class)
+                .setOxmClass(OpenflowBasicClass.VALUE)
+                .setOxmMatchField(InPort.VALUE)
                 .setHasMask(false)
                 .setMatchEntryValue(caseBuilder.build());
 
@@ -60,46 +56,25 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase {
                 .setMatchEntry(Lists.newArrayList(matchEntryBuilder.build()));
 
         return new PacketInMessageBuilder()
-                .setVersion(OFConstants.OFP_VERSION_1_0)
+                .setVersion(EncodeConstants.OF_VERSION_1_0)
                 .setData(PACKET_DATA.getBytes())
                 .setReason(PacketInReason.OFPRACTION)
                 .setMatch(matchBuilder.build())
-                .setVersion(OFConstants.OFP_VERSION_1_3)
-                .setCookie(BigInteger.ZERO)
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
+                .setCookie(Uint64.ZERO)
                 .setTableId(new TableId(TABLE_ID))
                 .build();
     }
 
-    @Before
-    public void setUp() throws Exception {
-        // Initialize the OpenFlow version/port map
-        OpenflowPortsUtil.init();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testForNotNullablePacketInInGetPortNo() throws Exception {
-        NodeConnectorRefToPortTranslator.getPortNoFromPacketIn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testForNotNullablePacketInInToNodeConnectorRef() throws Exception {
-        NodeConnectorRefToPortTranslator.toNodeConnectorRef(null, DATA_PATH_ID);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testForNotNullableNodeConnectorRefInFromNodeConnectorRef() throws Exception {
-        NodeConnectorRefToPortTranslator.fromNodeConnectorRef(null, OF_VERSION);
-    }
-
     @Test
-    public void testGetPortNoFromPacketIn() throws Exception {
+    public void testGetPortNoFromPacketIn() {
         PacketIn packetIn = createPacketIn(PORT_NO);
-        Long portNo = NodeConnectorRefToPortTranslator.getPortNoFromPacketIn(packetIn);
+        Uint32 portNo = NodeConnectorRefToPortTranslator.getPortNoFromPacketIn(packetIn);
         assertEquals(portNo, PORT_NO);
     }
 
     @Test
-    public void testNodeConnectorConversion() throws Exception {
+    public void testNodeConnectorConversion() {
         // Mock the packet in message
         PacketIn packetIn = createPacketIn(PORT_NO);
 
@@ -107,7 +82,7 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase {
         NodeConnectorRef ref = NodeConnectorRefToPortTranslator.toNodeConnectorRef(packetIn, DATA_PATH_ID);
 
         // Get port number from created NodeConnectorRef
-        Long refPort = NodeConnectorRefToPortTranslator.fromNodeConnectorRef(ref, OF_VERSION);
+        Uint32 refPort = NodeConnectorRefToPortTranslator.fromNodeConnectorRef(ref, OF_VERSION);
 
         // Check if we got the correct port number
         assertEquals(PORT_NO, refPort);
@@ -116,6 +91,6 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase {
         assertEquals(ref, NodeConnectorRefToPortTranslator.toNodeConnectorRef(packetIn, DATA_PATH_ID));
 
         // Check if 2 NodeConnectorRef created from same PacketIn but different datapaths do not have same value
-        assertNotSame(ref, NodeConnectorRefToPortTranslator.toNodeConnectorRef(packetIn, BigInteger.ONE));
+        assertNotSame(ref, NodeConnectorRefToPortTranslator.toNodeConnectorRef(packetIn, Uint64.ONE));
     }
 }