incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r765259 - in /incubator/sling/trunk/launchpad: test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/
Date Wed, 15 Apr 2009 16:20:34 GMT
Author: bdelacretaz
Date: Wed Apr 15 16:20:33 2009
New Revision: 765259

URL: http://svn.apache.org/viewvc?rev=765259&view=rev
Log:
SLING-923 - Servlet resolution examples and integration tests

Added:
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
  (with props)
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
  (with props)
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
  (with props)
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
  (with props)
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
  (with props)
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
  (with props)
Modified:
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java

Modified: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java?rev=765259&r1=765258&r2=765259&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
(original)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
Wed Apr 15 16:20:33 2009
@@ -31,7 +31,8 @@
  * @scr.property name="sling.servlet.resourceTypes"
  *               value="sling/servlet/default"
  * @scr.property name="sling.servlet.extensions"
- *               value="TEST_EXT_3"
+ *               values.1="TEST_EXT_3"
+ *               values.2="TEST_EXT_4"
  */
 
 @SuppressWarnings("serial")

Modified: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java?rev=765259&r1=765258&r2=765259&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
(original)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
Wed Apr 15 16:20:33 2009
@@ -31,7 +31,8 @@
  * @scr.property name="sling.servlet.resourceTypes"
  *               value="sling/servlet/default"
  * @scr.property name="sling.servlet.extensions"
- *               value="TEST_EXT_3"
+ *               values.1="TEST_EXT_3"
+ *               values.2="TEST_EXT_5"
  */
 
 @SuppressWarnings("serial")

Modified: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java?rev=765259&r1=765258&r2=765259&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
(original)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
Wed Apr 15 16:20:33 2009
@@ -34,7 +34,7 @@
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
  * 
  * @scr.property name="sling.servlet.resourceTypes"
- *               value="TEST_HeadMethodServlet"
+ *               value="LAUNCHPAD_TEST_ResourceType"
  *               
  * @scr.property name="sling.servlet.methods"
  *               value = "PUT"

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,38 @@
+/*
+ * 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.servlets.resolution;
+
+/** Test the ExtensionServlet */
+public class ExtensionServletTest extends ResolutionTestBase {
+  
+  public void testExtensionOne() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_EXT_1", CONTENT_TYPE_PLAIN),
+        EXT_SERVLET_SUFFIX);
+  }
+  
+  public void testExtensionTwo() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_EXT_2", CONTENT_TYPE_PLAIN), 
+        EXT_SERVLET_SUFFIX);
+  }
+  
+  public void testExtensionOther() throws Exception {
+    assertNotTestServlet(
+        getContent(testNodeNORT.nodeUrl + ".txt", CONTENT_TYPE_PLAIN));
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,39 @@
+/*
+ * 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.servlets.resolution;
+
+/** Verify that PrefixServletZero overrides PrefixServletMinusOne */
+public class PrefixTest extends ResolutionTestBase {
+  
+  public void testPrefixServletZeroPresent() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_EXT_5", CONTENT_TYPE_PLAIN),
+        PREFIX_0_SERVLET_SUFFIX);
+  }
+  
+  public void testPrefixServletMinusOnePresent() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_EXT_4", CONTENT_TYPE_PLAIN),
+        PREFIX_M1_SERVLET_SUFFIX);
+  }
+  
+  public void testPrefixServletZeroWins() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_EXT_3", CONTENT_TYPE_PLAIN),
+        PREFIX_0_SERVLET_SUFFIX);
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.servlets.resolution;
+
+/** Test the priority of servlet selection mechanisms */
+public class PrioritiesTest extends ResolutionTestBase {
+  
+  public void testExtensionWinsOverSelector() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_SEL_2.TEST_EXT_1", CONTENT_TYPE_PLAIN),
+        EXT_SERVLET_SUFFIX);
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,37 @@
+/*
+ * 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.servlets.resolution;
+
+import org.apache.commons.httpclient.methods.PutMethod;
+
+/** Test the PutMethodServlet resolution */
+public class PutMethodServletTest extends ResolutionTestBase {
+  
+  public void testPutMethodServletSpecificRT() throws Exception {
+    final PutMethod put = new PutMethod(testNodeRT.nodeUrl);
+    final int status = httpClient.executeMethod(put);
+    assertEquals("PUT to testNodeRT should return 200", 200, status);
+    final String content = put.getResponseBodyAsString();
+    assertServlet(content, PUT_SERVLET_SUFFIX);
+  }
+  
+  public void testPutMethodServletDefaultRT() throws Exception {
+    final PutMethod put = new PutMethod(testNodeNORT.nodeUrl);
+    final int status = httpClient.executeMethod(put);
+    assertFalse("PUT to testNodeRT should not return 200", 200 == status);
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,87 @@
+/*
+ * 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.servlets.resolution;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/** Base class for servlet resolution tests */
+class ResolutionTestBase extends HttpTestBase {
+  public static final String CLASS_PROP = "servlet.class.name";
+  public static final String TEST_SERVLET_MARKER = "created by org.apache.sling.launchpad.testservices.servlets";
+  public static final String TEST_RESOURCE_TYPE = "LAUNCHPAD_TEST_ResourceType";
+  public static final String TEST_PATH = "/servlet-resolution-tests/" + System.currentTimeMillis();
+   
+  public static final String EXT_SERVLET_SUFFIX = "testservices.servlets.ExtensionServlet";
+  public static final String SEL_SERVLET_SUFFIX = "testservices.servlets.SelectorServlet";
+  public static final String PREFIX_0_SERVLET_SUFFIX = "testservices.servlets.PrefixServletZero";
+  public static final String PREFIX_M1_SERVLET_SUFFIX = "testservices.servlets.PrefixServletMinusOne";
+  public static final String PUT_SERVLET_SUFFIX = "testservices.servlets.PutMethodServlet";
+  
+  protected TestNode testNodeNORT;
+  protected TestNode testNodeRT;
+  
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    testNodeNORT = new TestNode(HTTP_BASE_URL + TEST_PATH, null);
+    final Map<String, String> properties = new HashMap<String, String>();
+    properties.put("sling:resourceType", TEST_RESOURCE_TYPE);
+    testNodeRT = new TestNode(HTTP_BASE_URL + TEST_PATH, properties);
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    testNodeNORT.delete();
+    testNodeRT.delete();
+  }
+
+  /** Asserts that the given content is in Properties format and
+   *  contains a property named CLASS_PROP that ends with
+   *  expected suffix  
+   */
+  protected void assertServlet(String content, String expectedSuffix) throws IOException
{
+    final Properties props = new Properties();
+    final InputStream is = new ByteArrayInputStream(content.getBytes());
+    props.load(is);
+    assertTrue(
+        "Content represents a non-empty Properties object (" + content + ")",
+        props.size() > 0);
+    final String clazz = props.getProperty(CLASS_PROP);
+    assertNotNull(
+        "Content contains " + CLASS_PROP + " property (" + content + ")",
+        clazz);
+    assertTrue(
+        CLASS_PROP + " property value (" + clazz + ") ends with " + expectedSuffix,
+        clazz.endsWith(expectedSuffix));
+  }
+  
+  /** Assert that content does not contain TEST_SERVLET_MARKER
+   */
+  protected void assertNotTestServlet(String content) {
+    if(content.contains(TEST_SERVLET_MARKER)) {
+      fail("Content should not contain " + TEST_SERVLET_MARKER + " marker (" + content +
")");
+    }
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java?rev=765259&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
(added)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
Wed Apr 15 16:20:33 2009
@@ -0,0 +1,38 @@
+/*
+ * 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.servlets.resolution;
+
+/** Test the SelectorServlet */
+public class SelectorServletTest extends ResolutionTestBase {
+  
+  public void testSelectorOne() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_SEL_1.txt", CONTENT_TYPE_PLAIN),
+        SEL_SERVLET_SUFFIX);
+  }
+  
+  public void testSelectorTwo() throws Exception {
+    assertServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_SEL_2.txt", CONTENT_TYPE_PLAIN),
+        SEL_SERVLET_SUFFIX);
+  }
+  
+  public void testSelectorOther() throws Exception {
+    assertNotTestServlet(
+        getContent(testNodeNORT.nodeUrl + ".TEST_SEL_3.txt", CONTENT_TYPE_PLAIN));
+  }
+}

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL



Mime
View raw message