Author: bdelacretaz
Date: Fri Jun 12 13:22:55 2015
New Revision: 1685087
URL: http://svn.apache.org/r1685087
Log:
SLING-4728 - our tests are really integration tests
Added:
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
- copied, changed from r1685068,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
- copied, changed from r1685071,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
- copied, changed from r1685071,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java
Removed:
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java
Modified:
sling/trunk/contrib/crankstart/launcher/pom.xml
Modified: sling/trunk/contrib/crankstart/launcher/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/pom.xml?rev=1685087&r1=1685086&r2=1685087&view=diff
==============================================================================
--- sling/trunk/contrib/crankstart/launcher/pom.xml (original)
+++ sling/trunk/contrib/crankstart/launcher/pom.xml Fri Jun 12 13:22:55 2015
@@ -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>
Copied:
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
(from r1685068,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java?p2=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java&p1=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java&r1=1685068&r2=1685087&rev=1685087&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
Fri Jun 12 13:22:55 2015
@@ -20,10 +20,11 @@ import org.junit.BeforeClass;
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;
Copied:
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
(from r1685071,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java?p2=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java&p1=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java&r1=1685071&r2=1685087&rev=1685087&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeATest.java
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
Fri Jun 12 13:22:55 2015
@@ -15,7 +15,7 @@ import org.junit.Rule;
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;
Copied:
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
(from r1685071,
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java?p2=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java&p1=sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java&r1=1685071&r2=1685087&rev=1685087&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBTest.java
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
Fri Jun 12 13:22:55 2015
@@ -15,7 +15,7 @@ import org.junit.Rule;
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;
