diff options
author | gjoranv <gv@verizonmedia.com> | 2019-10-21 16:31:58 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-10-23 17:06:02 +0200 |
commit | 5711cb8b5257f2bfcea1ab0a5b2f75b262c0f5d7 (patch) | |
tree | a8cb0554454bf7a21a964cb0aa4226603c10d826 /bundle-plugin-test/integration-test | |
parent | 15f690295f559730a37fab0bbdd00473f8d466a4 (diff) |
Use surefire instead of failsafe plugin.
- No need to use integration tests after test bundles have been
moved to separate modules.
Diffstat (limited to 'bundle-plugin-test/integration-test')
-rw-r--r-- | bundle-plugin-test/integration-test/pom.xml | 16 | ||||
-rw-r--r-- | bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleTest.java (renamed from bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleIT.java) | 2 | ||||
-rw-r--r-- | bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionTest.java (renamed from bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionIT.java) | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/bundle-plugin-test/integration-test/pom.xml b/bundle-plugin-test/integration-test/pom.xml index 642d74fb0e9..42d3b0e4d62 100644 --- a/bundle-plugin-test/integration-test/pom.xml +++ b/bundle-plugin-test/integration-test/pom.xml @@ -56,23 +56,13 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.9</version> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> + <artifactId>maven-surefire-plugin</artifactId> <configuration> - <trimStackTrace>false</trimStackTrace> + <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> <systemPropertyVariables> <test.bundle.path>${project.build.directory}/dependency</test.bundle.path> - <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> </systemPropertyVariables> + <trimStackTrace>false</trimStackTrace> </configuration> </plugin> <plugin> diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleTest.java index 5e76b08ab9f..9fb7e0e03ca 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleIT.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleTest.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertThat; * * @author Tony Vaagenes */ -public class BundleIT { +public class BundleTest { static final String TEST_BUNDLE_PATH = System.getProperty("test.bundle.path", ".") + "/"; private JarFile jarFile; diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionIT.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionTest.java index e2cee71ca9e..307a0698bd1 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionIT.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionTest.java @@ -9,7 +9,7 @@ import java.io.IOException; import java.util.jar.Attributes; import java.util.jar.JarFile; -import static com.yahoo.BundleIT.findBundleJar; +import static com.yahoo.BundleTest.findBundleJar; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; @@ -19,7 +19,7 @@ import static org.junit.Assert.assertThat; * * @author gjoranv */ -public class ExportPackageVersionIT { +public class ExportPackageVersionTest { private static Attributes mainAttributes; |