SLING-7327 Remove launchpad from feature names
authorOliver Lietz <olli@apache.org>
Fri, 22 Dec 2017 14:07:18 +0000 (15:07 +0100)
committerOliver Lietz <olli@apache.org>
Fri, 22 Dec 2017 14:07:18 +0000 (15:07 +0100)
src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java with 99% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlCouchbaseIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java with 97% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java with 97% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakIT.java with 95% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java with 97% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java with 93% similarity]

@@ -49,7 +49,6 @@ import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.karaf.testing.KarafTestSupport;
-import org.junit.After;
 import org.junit.Test;
 import org.ops4j.pax.exam.util.Filter;
 import org.osgi.framework.ServiceRegistration;
@@ -61,7 +60,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public abstract class AbstractSlingLaunchpadOakTestSupport extends KarafTestSupport {
+public abstract class AbstractSlingQuickstartOakTestSupport extends KarafTestSupport {
 
     @Inject
     @Filter(timeout = 300000)
@@ -73,7 +72,7 @@ public abstract class AbstractSlingLaunchpadOakTestSupport extends KarafTestSupp
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    public AbstractSlingLaunchpadOakTestSupport() {
+    public AbstractSlingQuickstartOakTestSupport() {
     }
 
     @Test
@@ -44,7 +44,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadNosqlCouchbaseIT extends KarafTestSupport {
+public class SlingQuickstartNosqlCouchbaseIT extends KarafTestSupport {
 
     private static CouchbaseMock couchbase;
 
@@ -83,7 +83,7 @@ public class SlingLaunchpadNosqlCouchbaseIT extends KarafTestSupport {
             mavenBundle().groupId("com.googlecode.json-simple").artifactId("json-simple").versionAsInProject(),
             mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.rhino").versionAsInProject(),
             mavenBundle().groupId("org.tukaani").artifactId("xz").versionAsInProject(),
-            addSlingFeatures("sling-launchpad-nosql-couchbase")
+            addSlingFeatures("sling-quickstart-nosql-couchbase")
         );
     }
 
@@ -51,7 +51,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadNosqlMongoIT extends KarafTestSupport {
+public class SlingQuickstartNosqlMongoIT extends KarafTestSupport {
 
     private static MongodExecutable executable;
 
@@ -89,7 +89,7 @@ public class SlingLaunchpadNosqlMongoIT extends KarafTestSupport {
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject()),
             mavenBundle().groupId("org.apache.commons").artifactId("commons-compress").versionAsInProject(),
-            addSlingFeatures("sling-launchpad-nosql-mongodb")
+            addSlingFeatures("sling-quickstart-nosql-mongodb")
         );
     }
 
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadOakIT extends KarafTestSupport {
+public class SlingQuickstartOakIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-launchpad-oak")
+            addSlingFeatures("sling-quickstart-oak")
         );
     }
 
@@ -47,7 +47,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadOakMongoIT extends AbstractSlingLaunchpadOakTestSupport {
+public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSupport {
 
     private static MongodExecutable executable;
 
@@ -81,7 +81,7 @@ public class SlingLaunchpadOakMongoIT extends AbstractSlingLaunchpadOakTestSuppo
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject()),
             mavenBundle().groupId("org.apache.commons").artifactId("commons-compress").versionAsInProject(),
-            addSlingFeatures("sling-launchpad-oak-mongo")
+            addSlingFeatures("sling-quickstart-oak-mongo")
         );
     }
 
@@ -33,12 +33,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadOakTarIT extends AbstractSlingLaunchpadOakTestSupport {
+public class SlingQuickstartOakTarIT extends AbstractSlingQuickstartOakTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-launchpad-oak-tar")
+            addSlingFeatures("sling-quickstart-oak-tar")
         );
     }