This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.crankstart.launcher-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-crankstart-launcher.git
commit 3d4007b46f30377894e1e116e8afe07a57abdce0 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Tue Jul 1 10:56:26 2014 +0000 Fix registration of multiple resources via the Sling installer git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/crankstart/launcher@1607039 13f79535-47bb-0310-9956-ffa450edef68 --- .../launcher/CrankstartBootstrapTest.java | 23 ++++++++++++++++++++++ src/test/resources/launcher-test.crank.txt | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java b/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java index c0d7f0d..f5c8547 100644 --- a/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java +++ b/src/test/java/org/apache/sling/crankstart/launcher/CrankstartBootstrapTest.java @@ -193,6 +193,29 @@ public class CrankstartBootstrapTest { @Test @Retry(timeoutMsec=10000, intervalMsec=250) + public void testAdditionalBundles() throws Exception { + setAdminCredentials(); + final String basePath = "/system/console/bundles/"; + final String [] addBundles = { + "org.apache.sling.commons.mime", + "org.apache.sling.settings" + }; + + for(String name : addBundles) { + final String path = basePath + name; + final HttpUriRequest get = new HttpGet(baseUrl + path); + HttpResponse response = null; + try { + response = client.execute(get); + assertEquals("Expecting additional bundle to be present at " + get.getURI(), 200, response.getStatusLine().getStatusCode()); + } finally { + closeConnection(response); + } + } + } + + @Test + @Retry(timeoutMsec=10000, intervalMsec=250) public void testFelixFormatConfig() throws Exception { setAdminCredentials(); final String path = "/system/console/config/configuration-status-20140606-1347+0200.txt"; diff --git a/src/test/resources/launcher-test.crank.txt b/src/test/resources/launcher-test.crank.txt index 84435f6..32266d5 100644 --- a/src/test/resources/launcher-test.crank.txt +++ b/src/test/resources/launcher-test.crank.txt @@ -69,8 +69,13 @@ config empty.config.should.work FORMAT:felix.config # Test an extension command provided by our test-services bundle test.system.property the.test.system.property was set by test-services bundle -# Add the JUnit core via the Sling installer and our sling.extensions +# Prepare additional resources for the Sling installer sling.installer.resource mvn:org.apache.sling/org.apache.sling.junit.core/1.0.8 +sling.installer.resource mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.4 +sling.installer.resource mvn:org.apache.sling/org.apache.sling.settings/1.3.0 + +# And register the installer resources +sling.installer.register crankstart # Informative log log felix http service should come up at http://localhost:${http.port} -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
