Merge "Remove M2E lifecycle-mapping <execute/> for yang-maven-plugin"

[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..6aff6c3f8324332ce145024bd9145b1a68a0e3b4 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,22 @@
+/**
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 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
@@ -66,14 +73,14 @@ public class OpenflowPortsUtilTest {
     }
 
     //helper
-    private static void matchGetLogicalName(OpenflowVersion version, String logicalName) {
+    private static void matchGetLogicalName(final OpenflowVersion version, final String logicalName) {
         Assert.assertEquals("Controller reserve port not matching to logical-name for "+ version,
                 logicalName,
                 OpenflowPortsUtil.getPortLogicalName(version, mapVersionToPorts.get(version).get(logicalName)));
     }
 
     //helper
-    private static void matchGetPortfromLogicalName(OpenflowVersion version, String logicalName) {
+    private static void matchGetPortfromLogicalName(final OpenflowVersion version, final String logicalName) {
         Assert.assertEquals("Controller reserve port not matching to logical-name for "+ version,
                 mapVersionToPorts.get(version).get(logicalName), OpenflowPortsUtil.getPortFromLogicalName(version, logicalName));
     }
@@ -175,20 +182,22 @@ 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;
-        
-        portNumber = new CommonPort.PortNumber(42L);
+        PortNumberUni portNumber;
+
+        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));
+
+
+        portNumber = new PortNumberUni((String) null);
+        Assert.assertNotNull(portNumber);
+
     }
 
 }