You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/09/01 10:54:39 UTC
svn commit: r1758758 - in
/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests:
./ src/test/java/org/apache/sling/karaf/tests/configuration/
src/test/resources/
Author: olli
Date: Thu Sep 1 10:54:38 2016
New Revision: 1758758
URL: http://svn.apache.org/viewvc?rev=1758758&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf
enable repoinit tests
Added:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/repoinit.txt
Modified:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1758758&r1=1758757&r2=1758758&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml Thu Sep 1 10:54:38 2016
@@ -293,10 +293,6 @@
<exclude>org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.*</exclude>
<!-- TODO JspForwardTest.testWithJspForward:152 Content includes JSP marker -->
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.*</exclude>
- <!-- TODO RepoinitPathTest.pathExists:42 null -->
- <exclude>org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.*</exclude>
- <!-- TODO SystemUsersTest.provisioningModelUser:62->assertSystemUser:45 Impersonation as provisioningModelUser failed: javax.jcr.LoginException: Login Failure: all modules ignored -->
- <exclude>org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1758758&r1=1758757&r2=1758758&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Thu Sep 1 10:54:38 2016
@@ -18,19 +18,36 @@
*/
package org.apache.sling.karaf.tests.configuration;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
import org.apache.sling.karaf.testing.KarafTestSupport;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
+ private Option testBundle() throws Exception {
+ final InputStream repoinit = new FileInputStream("src/test/resources/repoinit.txt");
+ return streamBundle(
+ TinyBundles.bundle()
+ .add("repoinit.txt", repoinit)
+ .set(Constants.BUNDLE_MANIFESTVERSION, "2")
+ .set(Constants.BUNDLE_SYMBOLICNAME, "repoinit")
+ .build()
+ ).start();
+ }
+
@Configuration
- public Option[] configuration() {
+ public Option[] configuration() throws Exception {
final int httpPort = Integer.getInteger("http.port");
return OptionUtils.combine(baseConfiguration(),
cleanCaches(true),
@@ -44,6 +61,7 @@ public class SlingLaunchpadOakTarConfigu
// TODO PAXWEB-935 editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.cfg", "dav.root", "/dav"),
editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.cfg", "alias", "/server"),
editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.cfg", "enabled", "true"),
+ editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.cfg", "references", "raw:classpath://repoinit/repoinit.txt"),
addSlingFeatures(
"sling-launchpad-oak-tar",
"sling-launchpad-content",
@@ -57,8 +75,16 @@ public class SlingLaunchpadOakTarConfigu
"sling-jcr-jackrabbit-security",
"sling-jcr-repoinit"
),
+ // bundle for test (contains repoinit.txt)
+ testBundle(),
// misc (legacy, snapshots, ...) stuff
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").versionAsInProject(),
+ // Pax Url TODO: feature?
+ mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-commons").version("2.4.7"),
+ mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-classpath").version("2.4.7"),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").version("1.5.0"),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-util-property").version("1.5.0"),
+ mavenBundle().groupId("org.ops4j.pax.swissbox").artifactId("pax-swissbox-property").version("1.8.2"),
// test support
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").versionAsInProject(),
Added: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/repoinit.txt
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/repoinit.txt?rev=1758758&view=auto
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/repoinit.txt (added)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/repoinit.txt Thu Sep 1 10:54:38 2016
@@ -0,0 +1,22 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+create path /repoinit/provisioningModelTest
+
+create service user provisioningModelUser