svn commit: r1534666 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/

[bd...@apache.org]

Author: bdelacretaz
Date: Tue Oct 22 15:39:48 2013
New Revision: 1534666

URL: http://svn.apache.org/r1534666
Log:
SLING-3155 - verify the actual repository name when testing

Added:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RepositoryNameTest.java
    sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/RepositoryDescriptorsServlet.java

Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RepositoryNameTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RepositoryNameTest.java?rev=1534666&view=auto
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RepositoryNameTest.java (added)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RepositoryNameTest.java Tue Oct 22 15:39:48 2013
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/** Verify the repository name, to make sure we're testing the right one */
+public class RepositoryNameTest extends HttpTestBase {
+    
+    /** Use the same property that Sling uses to switch between repositories.
+     *  Current run modes are "jackrabbit" and "oak".
+     */
+    public static final String RUN_MODE_PROP = "sling.run.modes";
+    public static final String DEFAULT_RUN_MODE = "jackrabbit";
+    
+    public void testName() throws IOException {
+        final String path = "/testing/RepositoryDescriptors.txt";
+        final String runMode = System.getProperty(RUN_MODE_PROP, DEFAULT_RUN_MODE);
+        final String content = getContent(HTTP_BASE_URL + path, CONTENT_TYPE_PLAIN).toLowerCase();
+        final Pattern expectedPattern = Pattern.compile("(?s).*jcr.repository.name=[^$]*" + runMode + ".*");
+        assertTrue(
+                "Expecting lowercased content at " + path + " to match " + expectedPattern + ", content=" + content, 
+                expectedPattern.matcher(content).matches());
+    }
+}

Added: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/RepositoryDescriptorsServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/RepositoryDescriptorsServlet.java?rev=1534666&view=auto
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/RepositoryDescriptorsServlet.java (added)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/RepositoryDescriptorsServlet.java Tue Oct 22 15:39:48 2013
@@ -0,0 +1,63 @@
+/*
+ * 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.testservices.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.jcr.Repository;
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+
+/** Test servlet that dumps our repository descriptors */ 
+@SuppressWarnings("serial")
+@Component(immediate = true)
+@Service
+@Properties({ @Property(name = "service.description", value = "Repository Descriptors Servlet"),
+        @Property(name = "service.vendor", value = "The Apache Software Foundation"),
+        @Property(name = "sling.servlet.paths", value = "/testing/RepositoryDescriptors"),
+        @Property(name = "sling.servlet.extensions", value = "txt")})
+public class RepositoryDescriptorsServlet extends SlingSafeMethodsServlet {
+
+    @Reference
+    private Repository repository;
+    
+    @Override
+    protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) 
+    throws ServletException,IOException {
+        final PrintWriter pw = response.getWriter();
+        response.setContentType("text/plain");
+        response.setCharacterEncoding("UTF-8");
+        
+        for(String key : repository.getDescriptorKeys()) {
+            final String v = repository.getDescriptor(key);
+            pw.print(key);
+            pw.print("=");
+            pw.println(v);
+        }
+        pw.flush();
+    }
+    
+}
\ No newline at end of file