enable repoinit and LoginAdminWhitelist (adjust ITs)
authorOliver Lietz <olli@apache.org>
Fri, 28 Oct 2016 07:43:15 +0000 (07:43 +0000)
committerOliver Lietz <olli@apache.org>
Fri, 28 Oct 2016 07:43:15 +0000 (07:43 +0000)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1766947 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrOakIT.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java

index b077134..2ca4d1d 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.sling.karaf.tests.bootstrap;
 
 import org.apache.sling.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -44,13 +45,6 @@ public class SlingJcrOakIT extends KarafTestSupport {
     }
 
     @Test
-    public void testOrgApacheSlingJcrOakServer() {
-        final Bundle bundle = findBundle("org.apache.sling.jcr.oak.server");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
-    @Test
     public void testOrgApacheJackrabbitOakCore() {
         final Bundle bundle = findBundle("org.apache.jackrabbit.oak-core");
         assertNotNull(bundle);
@@ -78,13 +72,6 @@ public class SlingJcrOakIT extends KarafTestSupport {
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
-    @Test // TODO SLING-5796 Make Oak Lucene optional
-    public void testOrgApacheJackrabbitOakLucene() {
-        final Bundle bundle = findBundle("org.apache.jackrabbit.oak-lucene");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
     @Test
     public void testComGoogleGuava() {
         final Bundle bundle = findBundle("com.google.guava");
@@ -93,6 +80,7 @@ public class SlingJcrOakIT extends KarafTestSupport {
     }
 
     @Test
+    @Ignore
     public void testOrgApacheFelixJaas() {
         final Bundle bundle = findBundle("org.apache.felix.jaas");
         assertNotNull(bundle);
index 026ec4b..5b8262d 100644 (file)
@@ -86,6 +86,13 @@ public class SlingLaunchpadOakMongoIT extends AbstractSlingLaunchpadOakTestSuppo
     }
 
     @Test
+    public void testOrgApacheSlingJcrOakServer() {
+        final Bundle bundle = findBundle("org.apache.sling.jcr.oak.server");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
+    @Test
     public void testOrgMongodbMongoJavaDriver() {
         final Bundle bundle = findBundle("org.mongodb.mongo-java-driver");
         assertNotNull(bundle);
index f7e4bda..3b60527 100644 (file)
@@ -43,6 +43,13 @@ public class SlingLaunchpadOakTarIT extends AbstractSlingLaunchpadOakTestSupport
     }
 
     @Test
+    public void testOrgApacheSlingJcrOakServer() {
+        final Bundle bundle = findBundle("org.apache.sling.jcr.oak.server");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
+    @Test
     public void testOrgApacheJackrabbitOakSegment() {
         final Bundle bundle = findBundle("org.apache.jackrabbit.oak-segment");
         assertNotNull(bundle);