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 3d47758 SLING-9579 - The
org.apache.sling.servlets.resolver.internal.resource.MergingServletResourceProvider
should not return NonExistingResources
3d47758 is described below
commit 3d4775885c02aac7797b97744386dafe6a77ce79
Author: Radu Cotescu <[email protected]>
AuthorDate: Fri Jul 10 13:30:12 2020 +0200
SLING-9579 - The
org.apache.sling.servlets.resolver.internal.resource.MergingServletResourceProvider
should not return NonExistingResources
* switched the teleported tests to resolve the servlet resources, rather
than get them
SLING-9580 - Make the dependency resolution more resource-type centric
* all JS tests should now pass, since the JS Use provider's dependency
resolution mechanism has been
improved
---
.../bundle/tracker/it/ExampleBundleExtend1TeleportedIT.java | 2 +-
.../sling/scripting/bundle/tracker/it/ExampleBundleExtend2IT.java | 3 ---
.../bundle/tracker/it/ExampleBundleExtend2TeleportedIT.java | 6 +++---
.../bundle/tracker/it/ExampleBundlePrecompiledJSPTeleportedIT.java | 6 +++---
.../bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java | 6 +++---
.../scripting/bundle/tracker/it/ExampleBundleTeleportedIT.java | 6 +++---
it/src/test/provisioning/it-model.txt | 3 +++
7 files changed, 16 insertions(+), 16 deletions(-)
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 e7fb04e..8dde144 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
@@ -39,7 +39,7 @@ public class ExampleBundleExtend1TeleportedIT extends
AbstractTeleportedTestBase
final String expectedRT =
"org.apache.sling.scripting.examplebundle.extend1.hello/1.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertEquals("org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0",
main.getResourceSuperType());
Map<String, Resource> children = collectResourceChildren(main);
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 c0c57d0..063339d 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,7 +20,6 @@ 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;
@@ -31,7 +30,6 @@ 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";
@@ -57,7 +55,6 @@ 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";
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 13de041..f8b60b7 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
@@ -38,7 +38,7 @@ public class ExampleBundleExtend2TeleportedIT extends
AbstractTeleportedTestBase
final String expectedRT =
"org.apache.sling.scripting.examplebundle.extend2.one/1.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertEquals("org.apache.sling.scripting.examplebundle.extend1.hello/1.0.0",
main.getResourceSuperType());
Map<String, Resource> children = collectResourceChildren(main);
@@ -60,7 +60,7 @@ public class ExampleBundleExtend2TeleportedIT extends
AbstractTeleportedTestBase
final String expectedRT =
"org.apache.sling.scripting.examplebundle.extend2.two/1.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertEquals("org.apache.sling.scripting.examplebundle.extend2.one/1.0.0",
main.getResourceSuperType());
Map<String, Resource> children = collectResourceChildren(main);
@@ -83,7 +83,7 @@ public class ExampleBundleExtend2TeleportedIT extends
AbstractTeleportedTestBase
final String expectedRT =
"org.apache.sling.scripting.examplebundle.extend2.three";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertEquals("sling/scripting/examplebundle/hello",
main.getResourceSuperType());
Map<String, Resource> children = collectResourceChildren(main);
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 90b6455..cadc653 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
@@ -39,7 +39,7 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends
AbstractTeleportedT
final String expectedRT =
"org.apache.sling.scripting.examplebundle.precompiled.jsp.hello";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -66,7 +66,7 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends
AbstractTeleportedT
final String expectedRT =
"org.apache.sling.scripting.examplebundle.precompiled.jsp.base";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -92,7 +92,7 @@ public class ExampleBundlePrecompiledJSPTeleportedIT extends
AbstractTeleportedT
final String expectedRT =
"org.apache.sling.scripting.examplebundle.precompiled.jsp.extends";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
Map<String, Resource> children = collectResourceChildren(main);
assertEquals(1, children.size());
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 840d22c..0f18051 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
@@ -39,7 +39,7 @@ public class ExampleBundlePrecompiledTeleportedIT extends
AbstractTeleportedTest
final String expectedRT =
"org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -64,7 +64,7 @@ public class ExampleBundlePrecompiledTeleportedIT extends
AbstractTeleportedTest
final String expectedRT =
"org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -78,7 +78,7 @@ public class ExampleBundlePrecompiledTeleportedIT extends
AbstractTeleportedTest
"2.0.0.servlet",
"nested"
);
- assertNotNull(resolver.getResource("/apps/" + expectedRT +
"/nested/selector.html"));
+ assertNotNull(resolver.resolve("/apps/" + expectedRT +
"/nested/selector.html"));
assertEquals(expectedChildren,
children.values().stream().map(Resource::getPath).collect(Collectors.toSet()));
for (Resource child : children.values()) {
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 be2206d..f766fa5 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
@@ -39,7 +39,7 @@ public class ExampleBundleTeleportedIT extends
AbstractTeleportedTestBase {
final String expectedRT =
"org.apache.sling.scripting.examplebundle.hello/1.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -66,7 +66,7 @@ public class ExampleBundleTeleportedIT extends
AbstractTeleportedTestBase {
final String expectedRT =
"org.apache.sling.scripting.examplebundle.hello/2.0.0";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
@@ -93,7 +93,7 @@ public class ExampleBundleTeleportedIT extends
AbstractTeleportedTestBase {
final String expectedRT = "sling/scripting/examplebundle/hello";
ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
- Resource main = resolver.getResource("/apps/" + expectedRT);
+ Resource main = resolver.resolve("/apps/" + expectedRT);
assertNotNull(main);
assertTrue(main.getValueMap().isEmpty());
Map<String, Resource> children = collectResourceChildren(main);
diff --git a/it/src/test/provisioning/it-model.txt
b/it/src/test/provisioning/it-model.txt
index a386052..c69876a 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -42,3 +42,6 @@
[configurations]
org.apache.sling.engine.impl.SlingMainServlet
sling.trace.allow=B"true"
+
+ org.apache.sling.servlets.resolver.SlingServletResolver
+ servletresolver.mountProviders=B"false"
