Fix of port-number model

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / util / OpenflowPortsUtilTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
index d3be8d505f39a80b5d15367f77a0eaec58b67285..5cb08f8bb902f85dd1fce9168c46b4d1f14c9620 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
@@ -1,15 +1,16 @@
 package org.opendaylight.openflowplugin.openflow.md.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.CommonPort;
+import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.OutputPortValues;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author: Kamal Rameshan (kramesha@cisco.com)
  * @since : 6/2/14
@@ -175,20 +176,25 @@ public class OpenflowPortsUtilTest {
     }
 
     /**
-     * test for method {@link OpenflowPortsUtil#portNumberToString(CommonPort.PortNumber)}
+     * test for method {@link OpenflowPortsUtil#portNumberToString(PortNumber)}
      */
     @Test
     public void testPortNumberToString() {
-        CommonPort.PortNumber portNumber;
+        PortNumberUni portNumber;
         
-        portNumber = new CommonPort.PortNumber(42L);
+        portNumber = new PortNumberUni(42L);
         Assert.assertEquals("42", OpenflowPortsUtil.portNumberToString(portNumber));
         
-        portNumber = new CommonPort.PortNumber(OutputPortValues.FLOOD.toString());
+        portNumber = new PortNumberUni(OutputPortValues.FLOOD.toString());
         Assert.assertEquals("FLOOD", OpenflowPortsUtil.portNumberToString(portNumber));
         
-        portNumber = new CommonPort.PortNumber((String) null);
-        Assert.assertNull(OpenflowPortsUtil.portNumberToString(portNumber));
+        try {
+            portNumber = new PortNumberUni((String) null);
+            Assert.fail("NPE was expected - due to value type");
+        } catch (Exception e) {
+            // expected
+            Assert.assertEquals(NullPointerException.class, e.getClass());
+        }
     }
 
 }