Author: olli
Date: Tue Dec 2 07:36:11 2014
New Revision: 1642806
URL: http://svn.apache.org/r1642806
Log:
SLING-3821 add more test support bundles, exclude/include some tests
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadConfiguration.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml?rev=1642806&r1=1642805&r2=1642806&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
Tue Dec 2 07:36:11 2014
@@ -153,12 +153,13 @@
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.*</exclude>
+
<exclude>org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.*</exclude>
+
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JUnitCategoriesTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.*</exclude>
+
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ResourceResolverProxyTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
</excludes>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadConfiguration.java?rev=1642806&r1=1642805&r2=1642806&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadConfiguration.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadConfiguration.java
Tue Dec 2 07:36:11 2014
@@ -101,13 +101,16 @@ public class SlingLaunchpadConfiguration
addBootFeature("sling-auth-openid"),
addBootFeature("sling-auth-selector"),
addBootFeature("sling-scripting-groovy"),
+ addBootFeature("sling-installer-provider-jcr"),
// misc (legacy, snapshots, ...) stuff
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").version("1.0.3-SNAPSHOT"),
// test support
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").version("1.0.9-SNAPSHOT"),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").version("1.0.9-SNAPSHOT"),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.scriptable").version("1.0.9-SNAPSHOT"),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-services").version("2.0.9-SNAPSHOT")
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-services").version("2.0.9-SNAPSHOT"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").version("2.0.9-SNAPSHOT"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.samples.failingtests").version("1.0.6")
);
}
