svn commit: r1535342 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/ test-bundles/src/main/bundles/

[bd...@apache.org]

Author: bdelacretaz
Date: Thu Oct 24 11:40:45 2013
New Revision: 1535342

URL: http://svn.apache.org/r1535342
Log:
SLING-3205 - test that a bundle with an inactive run mode is not installed (test disabled for now)

Added:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java
Modified:
    sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml

Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java?rev=1535342&view=auto
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java (added)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java Thu Oct 24 11:40:45 2013
@@ -0,0 +1,47 @@
+/*
+ * 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.webapp.integrationtest.runmodes;
+
+import java.io.IOException;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/** Verify that a bundle that has a non-active run mode is not present.
+ *  Uses a bundle provided by the test-bundles module with a runmode
+ *  that's not active in our tests. 
+ */
+public class InactiveRunModeTest extends HttpTestBase {
+    
+    private void assertBundlePresent(String symbolicName, boolean present) throws IOException {
+        final String bundlePath = "/system/console/bundles/" + symbolicName;
+        assertHttpStatus(HTTP_BASE_URL + bundlePath, present ? 200 : 404);
+    }
+    
+    /** Verify that assertBundlePresent works "*/
+    public void testBundleDetection() throws IOException {
+        assertBundlePresent("org.apache.sling.api", true);
+    }
+    
+    /** Verify that our test bundle is absent - it should be present
+     *  only if its specific run mode is active.
+     */
+    public void testBundleAbsent() throws IOException {
+        // TODO ignored due to SLING-3205
+        // assertBundlePresent("org.apache.sling.testing.samples.failingtests", false);
+    }
+    
+}

Modified: sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml?rev=1535342&r1=1535341&r2=1535342&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml Thu Oct 24 11:40:45 2013
@@ -17,6 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
+
+<!-- Additional bundles for the Sling launchpad tests --> 
 <bundles>
     <startLevel level="1">
         <bundle>
@@ -45,6 +47,11 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.test-services</artifactId>
             <version>2.0.9-SNAPSHOT</version>
+            <!-- 
+                Add some run modes to verify that one of 
+                these run modes is active. 
+             -->
+            <runModes>jackrabbit,oak</runModes>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
@@ -57,5 +64,15 @@
             <version>2.0.8</version>
             <type>war</type>
         </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.testing.samples.failingtests</artifactId>
+            <version>1.0.6</version>
+            <!-- 
+                Used to verify that a bundle with an inactive run mode
+                is not installed
+             -->
+            <runModes>failingtests</runModes>
+        </bundle>
     </startLevel>
 </bundles>