Rename AclServiceStatefulTestIPv6 to AclServiceStatefulIPv6Test

so that 'mvn test' runs it (surefire is based on *Test naming)

but @Ignore it, as it's currently completely broken (TODO fix it)

and patch IdHelper to show cause of NPE occuring in this broken test

Change-Id: I39d271cb12ff733ca617ca8869450a45d9db6571
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTestIPv6.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
similarity index 95%
rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTestIPv6.java
rename to vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
index 91323942fb20d808cc8fa77ae70a50e6a487a527..70b78f239e38acd779e669f5c97254da05f7a786 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTestIPv6.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
@@ -7,15 +7,15 @@
  */
 package org.opendaylight.netvirt.aclservice.tests;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.rules.MethodRule;
 import org.opendaylight.genius.datastoreutils.testutils.TestableDataTreeChangeListenerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig.SecurityGroupMode;
 
-
-public class AclServiceStatefulTestIPv6 extends AclServiceTestBaseIPv6 {
-
+@Ignore
+public class AclServiceStatefulIPv6Test extends AclServiceTestBaseIPv6 {
 
     public @Rule MethodRule guice = new GuiceRule(new AclServiceModule(),
             new AclServiceTestModule(SecurityGroupMode.Stateful),

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java
index 2b3f81c43d53d19e204af36132cb2f3c149fda59..3256970c01154459ab52e4cf0d3d1be20de7ecab 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java
@@ -51,6 +51,10 @@ public class IdHelper {
     }
 
     public static Integer getFlowPriority(String key) {
-        return flowPriorityCacheMap.get(key);
+        Integer priority = flowPriorityCacheMap.get(key);
+        if (priority == null) {
+            throw new IllegalArgumentException(key);
+        }
+        return priority;
     }
 }