Use PerClass to force a new container per test class

Change-Id: I72460583d501eeaa62a74a5ffb3bffaa633e995b
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/library/it/pom.xml b/library/it/pom.xml
index 151629048ab40f64406e5cb454352a7b602630fa..fc6a7a2d95381780178df92505a430cd62b5fbbd 100644 (file)
--- a/library/it/pom.xml
+++ b/library/it/pom.xml
@@ -77,7 +77,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>**/HardwareVTEPIT.java</exclude>
+            <!--<exclude>**/HardwareVTEPIT.java</exclude>-->
           </excludes>
         </configuration>
       </plugin>

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestIT.java b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestIT.java
index 13cd93eab4ab0477c64f6ba49704b2eb5dd145db..cb7c5786f5ac4cf993aa0e9546c2ffe549c7a1b6 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestIT.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestIT.java
@@ -51,12 +51,13 @@ import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
 import org.opendaylight.ovsdb.lib.schema.TableSchema;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.ops4j.pax.exam.spi.reactors.PerSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
+@ExamReactorStrategy(PerClass.class)
 public class OvsdbClientTestIT extends LibraryIntegrationTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbClientTestIT.class);
     OvsdbClient ovs;

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestTypedIT.java b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestTypedIT.java
index 6db208c9be8ae9dc3f74e129bc589495bbbb2b55..80b8cd84ec76a18c1073776d43b16e9999069abd 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestTypedIT.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbClientTestTypedIT.java
@@ -41,12 +41,13 @@ import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
 import org.opendaylight.ovsdb.lib.schema.TableSchema;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.ops4j.pax.exam.spi.reactors.PerSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
+@ExamReactorStrategy(PerClass.class)
 public class OvsdbClientTestTypedIT extends LibraryIntegrationTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbClientTestTypedIT.class);
     OvsdbClient ovs;

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/HardwareVTEPIT.java
similarity index 97%
rename from library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
rename to library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/HardwareVTEPIT.java
index 910471a1128ae1f4257f1b6d26ef52b783d46909..28266fe0795ab2708e1fb725401f7f2bb9959d54 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/HardwareVTEPIT.java
@@ -7,7 +7,7 @@
  *
  *  Authors : Sam Hague, Matt Oswalt
  */
-package org.opendaylight.ovsdb.integrationtest.schema.hardwarevtep;
+package org.opendaylight.ovsdb.integrationtest.schema;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -34,12 +34,12 @@ import org.opendaylight.ovsdb.schema.hardwarevtep.Global;
 import org.opendaylight.ovsdb.schema.hardwarevtep.Manager;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
+@ExamReactorStrategy(PerClass.class)
 public class HardwareVTEPIT  extends LibraryIntegrationTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(HardwareVTEPIT.class);
     private UUID testManagerUuid = null;

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/OpenVSwitchIT.java
similarity index 99%
rename from library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
rename to library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/OpenVSwitchIT.java
index 29e0186bcd4a6fccb09c823daeab477a45ea472a..249949cd3e4eda9bab362d1e212623a777f4128f 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/OpenVSwitchIT.java
@@ -7,7 +7,7 @@
  *
  *  Authors : Sam Hague, Matt Oswalt
  */
-package org.opendaylight.ovsdb.integrationtest.schema.openvswitch;
+package org.opendaylight.ovsdb.integrationtest.schema;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -59,12 +59,12 @@ import org.opendaylight.ovsdb.schema.openvswitch.SFlow;
 import org.opendaylight.ovsdb.schema.openvswitch.SSL;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
+@ExamReactorStrategy(PerClass.class)
 public class OpenVSwitchIT extends LibraryIntegrationTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(OpenVSwitchIT.class);
     private static final String TEST_BRIDGE_NAME = "br_test";

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIT.java b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIT.java
index e5f94a837c4e2a5a2e5c8bc5fce7829033a3f616..b134323691f677fb50c0184305a4f84c50c8b247 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIT.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIT.java
@@ -31,6 +31,7 @@ import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.ops4j.pax.exam.spi.reactors.PerSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +41,7 @@ import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 
 @RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
+@ExamReactorStrategy(PerClass.class)
 public class LibraryIT extends LibraryIntegrationTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(LibraryIT.class);
     private static final String TEST_BRIDGE_NAME = "br_test";