This is an automated email from the ASF dual-hosted git repository. diru pushed a commit to branch issue/SLING-11133 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
commit 1dcbdca14c0217277216a454f5a615923e31894d Author: Dirk Rudolph <[email protected]> AuthorDate: Fri Feb 11 10:12:56 2022 +0100 SLING-11133: add IT coverage for caching multiple adapter types --- .../sling/models/it/delegate/viaoriginalresource/models/B1Impl.java | 3 ++- .../sling/models/it/delegate/viaoriginalresource/models/BImpl.java | 3 ++- .../viaoriginalresource/ViaOriginalResourceDelegationIT.java | 4 ++++ .../java/org/apache/sling/models/testing/rtbound/FakeRequest.java | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java b/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java index a0a6637..38087d2 100644 --- a/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java +++ b/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java @@ -28,7 +28,8 @@ import org.apache.sling.models.it.delegate.viaoriginalresource.B1; @Model( adaptables = { SlingHttpServletRequest.class, Resource.class }, adapters = { B1.class, B.class }, - resourceType = "delegate/nestedrtbound/specific" + resourceType = "delegate/nestedrtbound/specific", + cache = true ) public class B1Impl implements B1 { diff --git a/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java b/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java index c807d6b..c62c126 100644 --- a/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java +++ b/src/main/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java @@ -24,7 +24,8 @@ import org.apache.sling.models.it.delegate.viaoriginalresource.B; @Model( adaptables = { SlingHttpServletRequest.class, Resource.class }, adapters = { B.class }, - resourceType = "delegate/nestedrtbound/generic" + resourceType = "delegate/nestedrtbound/generic", + cache = true ) public class BImpl implements B { } diff --git a/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java b/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java index 1b59672..4247b5b 100644 --- a/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java +++ b/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java @@ -104,6 +104,8 @@ public class ViaOriginalResourceDelegationIT { assertTrue(((A1Impl) model).other instanceof B1Impl); assertTrue(((A1Impl) model).delegate instanceof AImpl); assertTrue(((AImpl) ((A1Impl) model).delegate).other instanceof B1Impl); + // Since SLING-11133 and cache = true + assertSame(((A1Impl) model).other,((AImpl) ((A1Impl) model).delegate).other); } } @@ -128,6 +130,8 @@ public class ViaOriginalResourceDelegationIT { assertTrue(((A1Impl) model).other instanceof B1Impl); assertTrue(((A1Impl) model).delegate instanceof AImpl); assertTrue(((AImpl) ((A1Impl) model).delegate).other instanceof B1Impl); + // Since SLING-11133 and cache = true + assertSame(((A1Impl) model).other,((AImpl) ((A1Impl) model).delegate).other); } } } diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java b/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java index 51579b3..bcc4c7f 100644 --- a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java +++ b/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java @@ -22,6 +22,7 @@ import java.io.UnsupportedEncodingException; import java.security.Principal; import java.util.Collection; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -54,6 +55,7 @@ import org.jetbrains.annotations.NotNull; public class FakeRequest implements SlingHttpServletRequest { private final Resource resource; + private final Map<String, Object> attributes = new HashMap<>(); public FakeRequest(Resource r) { this.resource = r; @@ -266,7 +268,7 @@ public class FakeRequest implements SlingHttpServletRequest { @Override public Object getAttribute(String s) { - return null; + return attributes.get(s); } @Override @@ -356,7 +358,7 @@ public class FakeRequest implements SlingHttpServletRequest { @Override public void setAttribute(String s, Object o) { - + attributes.put(s, o); } @Override
