Bug 1254 - OFP test coverage increase

- PacketInUtil is final with private constructor instead of being abstract
- added unit test for PacketInUtil#getMdSalPacketInReason method

Change-Id: I260c3f92580187de93b4ce7a16512c4a13b9882b
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtil.java
index 5fb55d383ec234a76701267ce35e16155e5ee3c5..309411ffe070f57459c054937480c5a7880a7ff5 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtil.java
@@ -14,28 +14,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Pa
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController;
 
 /**
- * 
+ *
  */
-public abstract class PacketInUtil {
+public final class PacketInUtil {
+
+    private PacketInUtil(){
+        throw new AssertionError("PacketInUtil is not expected to be instantiated.");
+    }
 
     /**
      * @param reason
      * @return corresponding MD-SAL reason class for given OF-API reason
      */
-    public static Class <?extends PacketInReason> getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason reason) {
-        Class <?extends PacketInReason> resultReason = PacketInReason.class;
-    
-       if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRNOMATCH)) {
-               resultReason = NoMatch.class;
-       }
-       else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRINVALIDTTL)) {
-           resultReason = InvalidTtl.class;
-       }
-       else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRACTION)) {
-           resultReason = SendToController.class;
-       }
-    
-       return resultReason;
+    public static Class<? extends PacketInReason> getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason reason) {
+        Class<? extends PacketInReason> resultReason = PacketInReason.class;
+
+        if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRNOMATCH)) {
+            resultReason = NoMatch.class;
+        } else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRINVALIDTTL)) {
+            resultReason = InvalidTtl.class;
+        } else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRACTION)) {
+            resultReason = SendToController.class;
+        }
+
+        return resultReason;
     }
 
 }

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtilTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtilTest.java
new file mode 100644 (file)
index 0000000..fc442b0
--- /dev/null
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/PacketInUtilTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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 org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.InvalidTtl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.NoMatch;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by Martin Bobak mbobak@cisco.com on 7/2/14.
+ */
+public class PacketInUtilTest {
+
+
+    /**
+     * Test method for PacketInUtil#getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason);
+     */
+    @Test
+    public void testGetMdSalPacketInReason() {
+        Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketInReason> resultReason;
+
+        resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRACTION);
+        assertTrue(resultReason.getName().equals(SendToController.class.getName()));
+
+        resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRINVALIDTTL);
+        assertTrue(resultReason.getName().equals(InvalidTtl.class.getName()));
+
+        resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRNOMATCH);
+        assertTrue(resultReason.getName().equals(NoMatch.class.getName()));
+
+    }
+}