SLING-4728 - our tests are really integration tests
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1685087 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 2907179..7831805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,8 @@
<includes>
<include>CRANKSTART</include>
<include>felix-cache</include>
+ <include>jackrabbit</include>
+ <include>derby.log</include>
</includes>
</fileset>
</filesets>
@@ -92,13 +94,15 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <!-- pax url needs the local Maven repository to find snapshots we just built -->
- <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}/</org.ops4j.pax.url.mvn.localRepository>
- </systemProperties>
- </configuration>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java b/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
similarity index 97%
rename from src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java
rename to src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
index f5339fb..70ba369 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
@@ -20,10 +20,11 @@
import org.junit.Rule;
import org.junit.Test;
-/** Verify that we can start the Felix HTTP service
- * with a {@link CrankstartBootstrap}.
+/** Basic tests of the launcher, verify that we
+ * can start the Felix HTTP service and a few
+ * other things.
*/
-public class CrankstartBootstrapTest {
+public class BasicLauncherIT {
private static CrankstartSetup C;
private DefaultHttpClient client;
diff --git a/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java b/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java
rename to src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
index 6b87871..552756b 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
@@ -15,7 +15,7 @@
import org.junit.Test;
/** Test our run modes support */
-public class RunModeATest {
+public class RunModeAIT {
private static CrankstartSetup C = new CrankstartSetup();
private static WebconsoleClient osgiConsole;
diff --git a/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java b/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java
rename to src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
index 412c60b..c00e8f3 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
@@ -15,7 +15,7 @@
import org.junit.Test;
/** Test our run modes support */
-public class RunModeBTest {
+public class RunModeBIT {
private static CrankstartSetup C = new CrankstartSetup();
private static WebconsoleClient osgiConsole;
