Author: olli
Date: Tue Aug 19 20:14:32 2014
New Revision: 1618967
URL: http://svn.apache.org/r1618967
Log:
SLING-3821 enable more 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=1618967&r1=1618966&r2=1618967&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 Aug 19 20:14:32 2014
@@ -129,62 +129,33 @@
<include>**/*Test.class</include>
</includes>
<excludes>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostResponseCreatorTest.*</exclude>
<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/scripting/SlingJSPTaglibTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/userManager/UserPrivilegesInfoTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/xml/XPathTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/accessManager/AccessPrivilegesInfoTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/repository/JackrabbitRepositoryNameTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.*</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/GroovySlingResourceTypeRenderingTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JUnitCategoriesTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/NamespaceMappingTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ResourceResolverProxyTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.*</exclude>
-
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.*</exclude>
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
</excludes>
<forkMode>always</forkMode>
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=1618967&r1=1618966&r2=1618967&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 Aug 19 20:14:32 2014
@@ -100,7 +100,16 @@ public class SlingLaunchpadConfiguration
addBootFeature("sling-auth-form"),
addBootFeature("sling-auth-openid"),
addBootFeature("sling-auth-selector"),
- addBootFeature("sling-extension-adapter")
+ addBootFeature("sling-extension-adapter"),
+ // misc (legacy, snapshots, ...) stuff
+
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-all").version("1.8.9"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").version("1.0.3-SNAPSHOT"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.extensions.groovy").version("1.0.0-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")
);
}
