Use JobCoordinatorTestModule in aclservice component tests

This is required to be merged into netvirt at the same time as the
related change https://git.opendaylight.org/gerrit/#/c/60303/ goes into
genius; that one introduces the JobCoordinatorTestModule as part of
making genius' DJC delegate to infrautils' JC (and by doing so, breaks
the aclservice component tests).

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

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java
index 0dba6fd07d3ba24522e77c29864da47227d6359d..010bd53f01cb3b292c769b48d23bd35a1a47aefb 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java
@@ -31,6 +31,7 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.datastoreutils.testutils.AsyncEventsWaiter;
+import org.opendaylight.genius.datastoreutils.testutils.JobCoordinatorTestModule;
 import org.opendaylight.genius.datastoreutils.testutils.TestableDataTreeChangeListenerModule;
 import org.opendaylight.genius.testutils.TestInterfaceManager;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
@@ -64,7 +65,8 @@ public class AclLiveStatisticsRpcServiceTest {
     private static final Logger LOG = LoggerFactory.getLogger(AclLiveStatisticsRpcServiceTest.class);
 
     public @Rule MethodRule guice = new GuiceRule(new AclServiceModule(),
-            new AclServiceTestModule(SecurityGroupMode.Stateful), new TestableDataTreeChangeListenerModule());
+            new AclServiceTestModule(SecurityGroupMode.Stateful), new TestableDataTreeChangeListenerModule(),
+            new JobCoordinatorTestModule());
 
     @Inject
     AclserviceConfig config;

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
index b78466f7e8f22de4b28b8e4e5600f144763aa623..11a9b9f719a0d8fc6ee023562f2294c7b3e9bc78 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java
@@ -10,6 +10,7 @@ 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.JobCoordinatorTestModule;
 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;
@@ -19,7 +20,8 @@ public class AclServiceStatefulIPv6Test extends AclServiceTestBaseIPv6 {
 
     public @Rule MethodRule guice = new GuiceRule(new AclServiceModule(),
             new AclServiceTestModule(SecurityGroupMode.Stateful),
-            new TestableDataTreeChangeListenerModule());
+            new TestableDataTreeChangeListenerModule(),
+            new JobCoordinatorTestModule());
 
     private final FlowEntryObjectsStatefulIPv6 ipv6statefulentries = new FlowEntryObjectsStatefulIPv6();
 

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java
index e7067f0996322b8bd4c4903e1366ba00f56d1eb1..fb00bb6f153be88cba422bc00389cb1a3f36c0a3 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java
@@ -9,6 +9,7 @@ package org.opendaylight.netvirt.aclservice.tests;
 
 import org.junit.Rule;
 import org.junit.rules.MethodRule;
+import org.opendaylight.genius.datastoreutils.testutils.JobCoordinatorTestModule;
 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;
@@ -18,7 +19,8 @@ public class AclServiceStatefulTest extends AclServiceTestBase {
 
     public @Rule MethodRule guice = new GuiceRule(new AclServiceModule(),
             new AclServiceTestModule(SecurityGroupMode.Stateful),
-            new TestableDataTreeChangeListenerModule());
+            new TestableDataTreeChangeListenerModule(),
+            new JobCoordinatorTestModule());
 
     private final FlowEntryObjectsStateful ipv4statefulentries = new FlowEntryObjectsStateful();