svn commit: r1694326 - in /sling/trunk/bundles/jcr/contentloader: pom.xml src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java

[olli]

Author: olli
Date: Wed Aug  5 20:52:51 2015
New Revision: 1694326

URL: http://svn.apache.org/r1694326
Log:
SLING-4917 BasicInitialContentIT fails for the 
org.apache.sling.jcr.contentloader module

* replace StartupHandler from Karaf by anonymous one

Modified:
    sling/trunk/bundles/jcr/contentloader/pom.xml
    
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
    
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java

Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1694326&r1=1694325&r2=1694326&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Wed Aug  5 20:52:51 2015
@@ -331,11 +331,5 @@
       <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.launchpad.karaf</artifactId>
-      <version>0.1.1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

Modified: 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java?rev=1694326&r1=1694325&r2=1694326&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
 Wed Aug  5 20:52:51 2015
@@ -35,6 +35,8 @@ import javax.jcr.Session;
 import org.apache.commons.io.IOUtils;
 import org.apache.sling.commons.testing.junit.RetryRule;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupMode;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -89,6 +91,8 @@ public abstract class ContentBundleTestB
     
     @Before
     public void setup() throws Exception {
+        registerStartupHandler();
+
         session = repository.loginAdministrative(null);
         
         // The RetryRule executes this method on every retry, make
@@ -160,4 +164,30 @@ public abstract class ContentBundleTestB
         session.logout();
         session = null;
     }
+
+    private void registerStartupHandler() {
+        // SLING-4917 (org.apache.sling.paxexam.util.SlingSetupTest)
+        // In Sling launchpad 7 the SlingSettings service
+        // requires a StartupHandler, and that's usually provided
+        // by the launchpad bootstrap code. Supply our own so that
+        // everything starts properly.
+        // TODO should be provided by a utility/bootstrap bundle
+        final StartupHandler h = new StartupHandler() {
+
+            public void waitWithStartup(boolean b) {
+            }
+
+            public boolean isFinished() {
+                return true;
+            }
+
+            public StartupMode getMode() {
+                return StartupMode.INSTALL;
+            }
+
+        };
+
+        bundleContext.registerService(StartupHandler.class.getName(), h, null);
+    }
+
 }
\ No newline at end of file

Modified: 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java?rev=1694326&r1=1694325&r2=1694326&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java
 Wed Aug  5 20:52:51 2015
@@ -49,9 +49,7 @@ public final class PaxExamUtilities {
                     provision(bundle(thisProjectsBundle.toURI().toString())),
                     wrappedBundle(mavenBundle("org.apache.sling", 
"org.apache.sling.commons.testing").versionAsInProject()),
                     wrappedBundle(mavenBundle("org.ops4j.pax.tinybundles", 
"tinybundles").versionAsInProject()),
-                    mavenBundle("biz.aQute.bnd", 
"bndlib").versionAsInProject(),
-                    // TODO the Sling Settings service is not available 
without this (missing launchpad startup event?)
-                    
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.karaf").versionAsInProject()
+                    mavenBundle("biz.aQute.bnd", "bndlib").versionAsInProject()
             ).getOptions();
         } finally {
             SlingPaxOptions.setIgnoredBundles();