#1082 Run integration tests with Maven Failsafe Plugin

ops4j · Aug 13, 2023 · 40ff885 · 40ff885
1 parent 509079e
commit 40ff885
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/...iner/AbstractKarafTestContainerITest.java → ...ntainer/AbstractKarafTestContainerIT.java b/...iner/AbstractKarafTestContainerITest.java → ...ntainer/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/...f/container/Karaf3TestContainerITest.java → ...araf/container/Karaf3TestContainerIT.java b/...f/container/Karaf3TestContainerITest.java → ...araf/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/...ner/Karaf4EmbeddedTestContainerITest.java → ...tainer/Karaf4EmbeddedTestContainerIT.java b/...ner/Karaf4EmbeddedTestContainerITest.java → ...tainer/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/...f/container/Karaf4TestContainerITest.java → ...araf/container/Karaf4TestContainerIT.java b/...f/container/Karaf4TestContainerITest.java → ...araf/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/...r-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateDefaultJUnitBundles.java b/...r-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/...araf/src/test/java/org/ops4j/pax/exam/karaf/container/ValidateOverridingJUnitBundles.java b/...araf/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
@@ -119,7 +119,22 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>