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/02/20 21:22:54 UTC
svn commit: r1731450 -
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/
Author: olli
Date: Sat Feb 20 20:22:54 2016
New Revision: 1731450
URL: http://svn.apache.org/viewvc?rev=1731450&view=rev
Log:
SLING-4411 Provide Oak features
add AbstractSlingLaunchpadOakTestSupport (base class for SlingLaunchpadOakMongoIT and SlingLaunchpadOakTarIT)
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java?rev=1731450&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/AbstractSlingLaunchpadOakTestSupport.java Sat Feb 20 20:22:54 2016
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.sling.launchpad.karaf.tests.bootstrap;
+
+import javax.inject.Inject;
+import javax.jcr.Session;
+
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.ops4j.pax.exam.util.Filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.Assert.assertNotNull;
+
+public abstract class AbstractSlingLaunchpadOakTestSupport extends KarafTestSupport {
+
+ @Inject
+ @Filter(timeout = 300000)
+ public SlingRepository slingRepository;
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
+ public AbstractSlingLaunchpadOakTestSupport() {
+ }
+
+ @Test
+ public void testSlingRepository() throws Exception {
+ assertNotNull(slingRepository);
+ }
+
+ @Test
+ public void testVarSlingExists() throws Exception {
+ final Session session = slingRepository.loginAdministrative(null);
+ session.getRootNode().getNode("var/sling");
+ session.logout();
+ }
+
+}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java?rev=1731450&r1=1731449&r2=1731450&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java Sat Feb 20 20:22:54 2016
@@ -20,9 +20,6 @@ package org.apache.sling.launchpad.karaf
import java.io.IOException;
-import javax.inject.Inject;
-import javax.jcr.Session;
-
import de.flapdoodle.embed.mongo.MongodExecutable;
import de.flapdoodle.embed.mongo.MongodProcess;
import de.flapdoodle.embed.mongo.MongodStarter;
@@ -31,8 +28,6 @@ import de.flapdoodle.embed.mongo.config.
import de.flapdoodle.embed.mongo.config.Net;
import de.flapdoodle.embed.mongo.distribution.Version;
import de.flapdoodle.embed.process.runtime.Network;
-import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +37,6 @@ import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.Bundle;
import static org.junit.Assert.assertEquals;
@@ -53,11 +47,7 @@ import static org.ops4j.pax.exam.karaf.o
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadOakMongoIT extends KarafTestSupport {
-
- @Inject
- @Filter(timeout = 300000)
- public SlingRepository slingRepository;
+public class SlingLaunchpadOakMongoIT extends AbstractSlingLaunchpadOakTestSupport {
private static MongodExecutable executable;
@@ -103,16 +93,4 @@ public class SlingLaunchpadOakMongoIT ex
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testSlingRepository() throws Exception {
- assertNotNull(slingRepository);
- }
-
- @Test
- public void testVarSlingExists() throws Exception {
- final Session session = slingRepository.loginAdministrative(null);
- session.getRootNode().getNode("var/sling");
- session.logout();
- }
-
}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java?rev=1731450&r1=1731449&r2=1731450&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java Sat Feb 20 20:22:54 2016
@@ -18,12 +18,6 @@
*/
package org.apache.sling.launchpad.karaf.tests.bootstrap;
-import javax.inject.Inject;
-import javax.jcr.Session;
-
-import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
-import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -31,17 +25,10 @@ import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-
-import static org.junit.Assert.assertNotNull;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadOakTarIT extends KarafTestSupport {
-
- @Inject
- @Filter(timeout = 300000)
- public SlingRepository slingRepository;
+public class SlingLaunchpadOakTarIT extends AbstractSlingLaunchpadOakTestSupport {
@Configuration
public Option[] configuration() {
@@ -50,16 +37,4 @@ public class SlingLaunchpadOakTarIT exte
);
}
- @Test
- public void testSlingRepository() throws Exception {
- assertNotNull(slingRepository);
- }
-
- @Test
- public void testVarSlingExists() throws Exception {
- final Session session = slingRepository.loginAdministrative(null);
- session.getRootNode().getNode("var/sling");
- session.logout();
- }
-
}