commit 22ffaf1bacfc380c4195679f8176ed790420254c
author Radu Cotescu <radu@apache.org> Tue Apr 24 14:23:20 2018 +0200
committer Radu Cotescu <radu@apache.org> Thu Apr 26 11:21:27 2018 +0200
tree 57df258d4c9f6767916914ff59df7224180c69a8
parent d7d69973e8c2b615186330e65c95a1fa67f3da29

Added more tests for selector matching

src/test/java/org/apache/sling/scripting/resolver/internal/ScriptMatchIT.java

diff --git a/src/test/java/org/apache/sling/scripting/resolver/internal/ScriptMatchIT.java b/src/test/java/org/apache/sling/scripting/resolver/internal/ScriptMatchIT.java
index 217ee59..3b7e569 100644
--- a/src/test/java/org/apache/sling/scripting/resolver/internal/ScriptMatchIT.java
+++ b/src/test/java/org/apache/sling/scripting/resolver/internal/ScriptMatchIT.java
@@ -18,6 +18,9 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package org.apache.sling.scripting.resolver.internal;
 
+import java.net.URI;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpDelete;
@@ -42,6 +45,11 @@
     }
 
     @Test
+    public void testGETMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpGet.METHOD_NAME);
+    }
+
+    @Test
     public void testHEADMethodMatching() throws Exception {
         HttpResponse response = getResponse(HttpHead.METHOD_NAME, "/content/srr/examples/script-matching.html", 200);
         Header[] header = response.getHeaders("X-Script-Name");
@@ -50,39 +58,98 @@
     }
 
     @Test
+    public void testHEADMethodSelectorMatching() throws Exception {
+        HttpResponse response = getResponse(HttpHead.METHOD_NAME, "/content/srr/examples/script-matching.selector-1.html", 200);
+        Header[] header = response.getHeaders("X-Script-Name");
+        assertEquals("Expected to find one X-Script-Name header.", 1, header.length);
+        assertEquals("/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching/1.0.0/HEAD.selector-1.html",
+                header[0].getValue());
+    }
+
+    @Test
     public void testOPTIONSMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpOptions.METHOD_NAME);
     }
 
     @Test
+    public void testOPTIONSMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpOptions.METHOD_NAME);
+    }
+
+    @Test
     public void testPOSTMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpPost.METHOD_NAME);
     }
 
     @Test
+    public void testPOSTMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpPost.METHOD_NAME);
+    }
+
+    @Test
     public void testPATCHMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpPatch.METHOD_NAME);
     }
 
     @Test
+    public void testPATCHMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpPatch.METHOD_NAME);
+    }
+
+    @Test
     public void testPUTMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpPut.METHOD_NAME);
     }
 
     @Test
+    public void testPUTMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpPut.METHOD_NAME);
+    }
+
+    @Test
     public void testDELETEMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpDelete.METHOD_NAME);
     }
 
     @Test
+    public void testDELETEMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpDelete.METHOD_NAME);
+    }
+
+    @Test
     public void testTRACEMethodMatching() throws Exception {
         testHttpMethodScriptMatching("/content/srr/examples/script-matching.html", HttpTrace.METHOD_NAME);
     }
 
+    @Test
+    public void testTRACEMethodSelectorMatching() throws Exception {
+        testHttpMethodScriptMatching("/content/srr/examples/script-matching.selector-1.html", HttpTrace.METHOD_NAME);
+    }
+
+    @Test
+    public void testSelectorMatching() throws Exception {
+        Document document = getDocument("/content/srr/examples/script-matching.selector-2.html");
+        assertTrue(document.select("div").html().contains("/javax.script/org.apache.sling.scripting.examplebundle" +
+                ".scriptmatching/1.0.0/selector-2.html"));
+    }
+
     private void testHttpMethodScriptMatching(String url, String httpMethod) throws Exception {
         Document document = getDocument(url, httpMethod);
-        assertTrue(document.select("div").html().contains(String.format("/javax.script/org.apache.sling.scripting.examplebundle" +
-                ".scriptmatching/1.0.0/%s.html matched", httpMethod)));
+        String path = url.substring(url.lastIndexOf('/'));
+        String[] parts = path.split("\\.");
+        String selectorString = null;
+        String extension = null;
+        if (parts.length == 3) {
+            selectorString = parts[1];
+            extension = parts[2];
+        } else if (parts.length == 2) {
+            extension = parts[1];
+        } else {
+            throw new IllegalArgumentException("The following URL doesn't seem to be correctly handled: " + url);
+        }
+        String expectedScriptName = "/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching/1.0.0/" + httpMethod +
+                (StringUtils.isNotEmpty(selectorString) ? "." + selectorString : "") + "." + extension;
+        assertTrue(document.select("div").html().contains(expectedScriptName));
     }
 
 }