This is an automated email from the ASF dual-hosted git repository. radu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push: new 7adc42d SLING-9475 - Do not register servlets using the default methods for bundled scripts 7adc42d is described below commit 7adc42d31f7c0c3773e91a32c051e1d3e3221984 Author: Radu Cotescu <r...@apache.org> AuthorDate: Thu May 28 18:21:28 2020 +0200 SLING-9475 - Do not register servlets using the default methods for bundled scripts * updated tests --- .../tracker/it/AbstractTeleportedTestBase.java | 2 +- .../it/ExampleBundleExtend1TeleportedIT.java | 12 +++---- .../bundle/tracker/it/ExampleBundleExtend2IT.java | 5 ++- .../it/ExampleBundleExtend2TeleportedIT.java | 37 ++++++++------------- .../ExampleBundlePrecompiledJSPTeleportedIT.java | 38 ++++++++-------------- .../it/ExampleBundlePrecompiledTeleportedIT.java | 31 +++++------------- .../tracker/it/ExampleBundleTeleportedIT.java | 30 ++++++----------- .../scripting/bundle/tracker/it/ITCustomizer.java | 1 + 8 files changed, 55 insertions(+), 101 deletions(-) diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractTeleportedTestBase.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractTeleportedTestBase.java index 19b181b..2f34af3 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractTeleportedTestBase.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractTeleportedTestBase.java @@ -51,7 +51,7 @@ public class AbstractTeleportedTestBase { protected Map<String, Resource> collectResourceChildren(Resource resource) { Map<String, Resource> children = new HashMap<>(); - resource.getChildren().forEach(child -> children.put(child.getPath(), child)); + resource.getChildren().forEach(child -> children.put(child.getName(), child)); return children; } } diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend1TeleportedIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend1TeleportedIT.java index f36c986..e7fb04e 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend1TeleportedIT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend1TeleportedIT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -42,18 +43,15 @@ public class ExampleBundleExtend1TeleportedIT extends AbstractTeleportedTestBase assertNotNull(main); assertEquals("org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0", main.getResourceSuperType()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(3, children.size()); + assertEquals(1, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, - "h.html", - "h.html.servlet", - "html.servlet" + "h.html" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); - assertEquals("org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0", children.get("/apps/" + expectedRT + "/html" + - ".servlet").getResourceSuperType()); + assertEquals("org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0", main.getResourceSuperType()); } } } diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2IT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2IT.java index 02bffcf..c0c57d0 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2IT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2IT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -30,6 +31,7 @@ public class ExampleBundleExtend2IT extends AbstractEndpointTestBase { private static final String ROOT = BASE + "/examplebundle-extend2"; @Test + @Ignore public void testOne() throws Exception { final String expectedRT = "org.apache.sling.scripting.examplebundle.extend2.one/1.0.0"; @@ -55,6 +57,7 @@ public class ExampleBundleExtend2IT extends AbstractEndpointTestBase { } @Test + @Ignore public void testOneV1() throws Exception { final String expectedRT = "org.apache.sling.scripting.examplebundle.extend2.one/1.0.0"; @@ -151,7 +154,7 @@ public class ExampleBundleExtend2IT extends AbstractEndpointTestBase { Document document = getDocument(ROOT + "/three.html"); Elements h2 = document.select("h2"); assertEquals(expectedRT, h2.html()); - final String expectedScriptDriver = "apps/sling/scripting/examplebundle/hello/hello.html"; + final String expectedScriptDriver = "/apps/sling/scripting/examplebundle/hello/hello.html"; assertTrue(h2.hasAttr(DATA_SCRIPT) && expectedScriptDriver.equals(h2.attr(DATA_SCRIPT))); Elements h = document.select("#h-extend2-three"); diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2TeleportedIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2TeleportedIT.java index 90a0c65..13de041 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2TeleportedIT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleExtend2TeleportedIT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -41,21 +42,16 @@ public class ExampleBundleExtend2TeleportedIT extends AbstractTeleportedTestBase assertNotNull(main); assertEquals("org.apache.sling.scripting.examplebundle.extend1.hello/1.0.0", main.getResourceSuperType()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(6, children.size()); + assertEquals(2, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", - "html.servlet", - "name-provider.js", - "name-provider.js.servlet", - "name-provider.html.servlet" + "name-provider.js" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); - assertEquals("org.apache.sling.scripting.examplebundle.extend1.hello/1.0.0", children.get("/apps/" + expectedRT + "/html" + - ".servlet").getResourceSuperType()); + assertEquals("org.apache.sling.scripting.examplebundle.extend1.hello/1.0.0", main.getResourceSuperType()); } } @@ -68,21 +64,17 @@ public class ExampleBundleExtend2TeleportedIT extends AbstractTeleportedTestBase assertNotNull(main); assertEquals("org.apache.sling.scripting.examplebundle.extend2.one/1.0.0", main.getResourceSuperType()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(6, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, - "html.servlet", + "1.0.0.servlet", "two.html", - "two.html.servlet", "two-templates.html", - "two-templates.html.servlet", "use-script-repo.js" ); - assertEquals(expectedChildren, children.keySet()); - - assertEquals("org.apache.sling.scripting.examplebundle.extend2.one/1.0.0", children.get("/apps/" + expectedRT + "/html" + - ".servlet").getResourceSuperType()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); + assertEquals("org.apache.sling.scripting.examplebundle.extend2.one/1.0.0", main.getResourceSuperType()); } } @@ -95,18 +87,15 @@ public class ExampleBundleExtend2TeleportedIT extends AbstractTeleportedTestBase assertNotNull(main); assertEquals("sling/scripting/examplebundle/hello", main.getResourceSuperType()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(3, children.size()); + assertEquals(1, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, - "h.html", - "h.html.servlet", - "html.servlet" + "h.html" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); - assertEquals("sling/scripting/examplebundle/hello", children.get("/apps/" + expectedRT + "/html" + - ".servlet").getResourceSuperType()); + assertEquals("sling/scripting/examplebundle/hello", main.getResourceSuperType()); } } } diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledJSPTeleportedIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledJSPTeleportedIT.java index f789af8..90b6455 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledJSPTeleportedIT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledJSPTeleportedIT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -42,21 +43,16 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends AbstractTeleportedT assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(9, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, + "hello.jsp", "h.jsp", - "h.jsp.servlet", - "h.html.servlet", "w.jsp", - "w.jsp.servlet", - "w.html.servlet", - "hello.jsp", - "hello.jsp.servlet", - "html.servlet" + "org.apache.sling.scripting.examplebundle.precompiled.jsp.hello.servlet" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", @@ -74,19 +70,16 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends AbstractTeleportedT assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(6, children.size()); + assertEquals(3, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "html.jsp", - "html.jsp.servlet", "html.servlet", - "selector.jsp", - "selector.html.servlet", - "selector.jsp.servlet" + "selector.jsp" ); - assertEquals(expectedChildren, children.keySet()); - + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); + assertTrue(String.format("Did not expect any properties on the %s resource.", main.getPath()), main.getValueMap().isEmpty()); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", child.getResourceSuperType()); @@ -101,21 +94,16 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends AbstractTeleportedT try (ResourceResolver resolver = resourceResolverFactory.getResourceResolver(AUTH_MAP)) { Resource main = resolver.getResource("/apps/" + expectedRT); assertNotNull(main); - assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(4, children.size()); + assertEquals(1, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, - "html.servlet", - "selector.jsp", - "selector.html.servlet", - "selector.jsp.servlet" + "selector.jsp" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); - assertEquals("org.apache.sling.scripting.examplebundle.precompiled.jsp.base", children.get("/apps/" + expectedRT + "/html" + - ".servlet").getResourceSuperType()); + assertEquals("org.apache.sling.scripting.examplebundle.precompiled.jsp.base", main.getResourceSuperType()); } } } diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java index b420ce1..6356f85 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -42,32 +43,19 @@ public class ExampleBundlePrecompiledTeleportedIT extends AbstractTeleportedTest assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(15, children.size()); + assertEquals(7, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", "w.html", - "w.html.servlet", "hello.html", - "hello.html.servlet", - "html.servlet", + "1.0.0.servlet", "templates.html", - "templates.html.servlet", "name-provider.js", - "name-provider.js.servlet", - "name-provider.html.servlet", - "use-script.js", - "use-script.js.servlet", - "use-script.html.servlet" + "use-script.js" ); - assertEquals(expectedChildren, children.keySet()); - - for (Resource child : children.values()) { - assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", - child.getResourceSuperType()); - } + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); } } @@ -80,19 +68,16 @@ public class ExampleBundlePrecompiledTeleportedIT extends AbstractTeleportedTest assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(7, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", "w.html", - "w.html.servlet", "hello.html", - "hello.html.servlet", - "html.servlet" + "2.0.0.servlet" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleTeleportedIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleTeleportedIT.java index 5286c97..be2206d 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleTeleportedIT.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleTeleportedIT.java @@ -20,6 +20,7 @@ package org.apache.sling.scripting.bundle.tracker.it; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -42,19 +43,16 @@ public class ExampleBundleTeleportedIT extends AbstractTeleportedTestBase { assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(7, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", "w.html", - "w.html.servlet", "hello.html", - "hello.html.servlet", - "html.servlet" + "1.0.0.servlet" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", @@ -72,19 +70,16 @@ public class ExampleBundleTeleportedIT extends AbstractTeleportedTestBase { assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(7, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", "w.html", - "w.html.servlet", "hello.html", - "hello.html.servlet", - "html.servlet" + "2.0.0.servlet" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", @@ -102,21 +97,16 @@ public class ExampleBundleTeleportedIT extends AbstractTeleportedTestBase { assertNotNull(main); assertTrue(main.getValueMap().isEmpty()); Map<String, Resource> children = collectResourceChildren(main); - assertEquals(9, children.size()); + assertEquals(4, children.size()); Set<String> expectedChildren = getChildrenForServletResource( "/apps/" + expectedRT, "h.html", - "h.html.servlet", "w.html", - "w.html.servlet", "hello.html", - "hello.html.servlet", - "html.servlet", - "templates.html", - "templates.html.servlet" + "templates.html" ); - assertEquals(expectedChildren, children.keySet()); + assertEquals(expectedChildren, children.values().stream().map(Resource::getPath).collect(Collectors.toSet())); for (Resource child : children.values()) { assertEquals(child.getPath() + " does not have the expected resource super type", "sling/bundle/resource", diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ITCustomizer.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ITCustomizer.java index 7445f7b..4d0895c 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ITCustomizer.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ITCustomizer.java @@ -35,5 +35,6 @@ public class ITCustomizer implements TeleporterRule.Customizer { cst.includeDependencyPrefix("org.apache.sling.scripting.bundle.tracker.it"); cst.setTestReadyTimeoutSeconds(20); cst.setWaitForServiceTimoutSeconds(20); + cst.setEnableLogging(true); } }