From 40ff8852cc5fe81d020b2eb88b1419c4c459b0fd Mon Sep 17 00:00:00 2001 From: Oliver Lietz Date: Sun, 13 Aug 2023 20:14:44 +0200 Subject: [PATCH] #1082 Run integration tests with Maven Failsafe Plugin --- ...t.java => AbstractKarafTestContainerIT.java} | 2 +- ...nerITest.java => Karaf3TestContainerIT.java} | 2 +- ....java => Karaf4EmbeddedTestContainerIT.java} | 2 +- ...nerITest.java => Karaf4TestContainerIT.java} | 2 +- .../container/ValidateDefaultJUnitBundles.java | 6 +----- .../ValidateOverridingJUnitBundles.java | 2 +- pom/pom.xml | 17 ++++++++++++++++- 7 files changed, 22 insertions(+), 11 deletions(-) rename containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/{AbstractKarafTestContainerITest.java => AbstractKarafTestContainerIT.java} (98%) rename containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/{Karaf3TestContainerITest.java => Karaf3TestContainerIT.java} (92%) rename containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/{Karaf4EmbeddedTestContainerITest.java => Karaf4EmbeddedTestContainerIT.java} (95%) rename containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/{Karaf4TestContainerITest.java => Karaf4TestContainerIT.java} (92%) diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerITest.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java similarity index 98% rename from containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerITest.java rename to containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java index c5819fd10..4b47888fc 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerITest.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java @@ -42,7 +42,7 @@ import org.osgi.framework.ServiceReference; @RunWith(PaxExam.class) -public abstract class AbstractKarafTestContainerITest { +public abstract class AbstractKarafTestContainerIT { private final MavenArtifactUrlReference KARAF_URL = maven("org.apache.karaf", "apache-karaf").type("zip"); diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerITest.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerIT.java similarity index 92% rename from containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerITest.java rename to containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerIT.java index 00e4e8cd7..0e96c5e08 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerITest.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf3TestContainerIT.java @@ -17,7 +17,7 @@ package org.ops4j.pax.exam.karaf.container; -public class Karaf3TestContainerITest extends AbstractKarafTestContainerITest { +public class Karaf3TestContainerIT extends AbstractKarafTestContainerIT { @Override protected String getDefaultKarafVersion() { diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerITest.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerIT.java similarity index 95% rename from containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerITest.java rename to containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerIT.java index 1ddbd87e3..5b9336832 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerITest.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4EmbeddedTestContainerIT.java @@ -27,7 +27,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; -public class Karaf4EmbeddedTestContainerITest extends AbstractKarafTestContainerITest { +public class Karaf4EmbeddedTestContainerIT extends AbstractKarafTestContainerIT { private final MavenArtifactUrlReference KARAF_URL = maven("org.apache.karaf", "apache-karaf").type("zip"); diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerITest.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerIT.java similarity index 92% rename from containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerITest.java rename to containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerIT.java index eeb43bdae..460172217 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerITest.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/Karaf4TestContainerIT.java @@ -17,7 +17,7 @@ package org.ops4j.pax.exam.karaf.container; -public class Karaf4TestContainerITest extends AbstractKarafTestContainerITest { +public class Karaf4TestContainerIT extends AbstractKarafTestContainerIT { @Override protected String getDefaultKarafVersion() { diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateDefaultJUnitBundles.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateDefaultJUnitBundles.java index c91452de9..2b58b0ef0 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateDefaultJUnitBundles.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateDefaultJUnitBundles.java @@ -19,16 +19,12 @@ import static org.junit.Assert.assertNotNull; -import javax.inject.Inject; - import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) -public class ValidateDefaultJUnitBundles extends Karaf4TestContainerITest { +public class ValidateDefaultJUnitBundles extends Karaf4TestContainerIT { @Test public void testDefaultJUnitBundlesPresent() throws Exception { diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateOverridingJUnitBundles.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateOverridingJUnitBundles.java index a9b5c3017..db13f8f23 100644 --- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateOverridingJUnitBundles.java +++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateOverridingJUnitBundles.java @@ -34,7 +34,7 @@ import org.osgi.framework.Bundle; @RunWith(PaxExam.class) -public class ValidateOverridingJUnitBundles extends Karaf4TestContainerITest { +public class ValidateOverridingJUnitBundles extends Karaf4TestContainerIT { @Override @Configuration diff --git a/pom/pom.xml b/pom/pom.xml index aa59e99b3..6a5fd68f7 100644 --- a/pom/pom.xml +++ b/pom/pom.xml @@ -119,7 +119,22 @@ - + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + true + +