This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch SLING-12884
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/SLING-12884 by this push:
new f695598f SLING-12884: refactor mocking in AliasMapEntriesTest - fix
test expectations for add/remove events
f695598f is described below
commit f695598f5d366b3df398bc40492ae9164ffc0459
Author: Julian Reschke <[email protected]>
AuthorDate: Wed Aug 13 12:33:55 2025 +0100
SLING-12884: refactor mocking in AliasMapEntriesTest - fix test
expectations for add/remove events
---
.../impl/mapping/AliasMapEntriesTest.java | 29 +++++++++++++---------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git
a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
index 5f9276b9..c70ca580 100644
---
a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
+++
b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
@@ -487,18 +487,19 @@ public class AliasMapEntriesTest extends
AbstractMappingMapEntriesTest {
Resource parent = createMockedResource("/parent");
Resource result = createMockedResource("/parent/child");
-
- // TODO: using attachChildResource causes the test to fail
- // attachChildResource(parent, result);
-
- when(result.getParent()).thenReturn(parent);
+ attachChildResource(parent, result);
when(result.getValueMap()).thenReturn(buildValueMap(ResourceResolverImpl.PROP_ALIAS,
"alias"));
+ Map<String, Collection<String>> aliasMapBefore =
mapEntries.getAliasMap("/parent");
+ assertEquals(1, aliasMapBefore.size());
+ // this simulates an add event, but that is immaterial here as there
is no cache anyway
addResource(mapEntries, "/parent/child", new AtomicBoolean());
- Map<String, Collection<String>> aliasMap =
mapEntries.getAliasMap("/parent");
- assertEquals(Collections.emptyMap(), aliasMap);
+ Map<String, Collection<String>> aliasMapAfter =
mapEntries.getAliasMap("/parent");
+ assertEquals(1, aliasMapAfter.size());
+
+ assertEquals(aliasMapBefore, aliasMapAfter);
}
// SLING-3727
@@ -511,16 +512,20 @@ public class AliasMapEntriesTest extends
AbstractMappingMapEntriesTest {
Resource parent = createMockedResource("/parent");
Resource result = createMockedResource("/parent/child");
- // TODO: using attachChildResource causes the test to fail
- // attachChildResource(parent, result);
+ attachChildResource(parent, result);
- when(result.getParent()).thenReturn(parent);
when(result.getValueMap()).thenReturn(buildValueMap(ResourceResolverImpl.PROP_ALIAS,
"alias"));
+ Map<String, Collection<String>> aliasMapBefore =
mapEntries.getAliasMap("/parent");
+ assertEquals(1, aliasMapBefore.size());
+
+ // this simulates a remove event, but that is immaterial here as there
is no cache anyway
removeAlias(mapEntries, resourceResolver, "/parent", "/parent/child",
NOOP);
- Map<String, Collection<String>> aliasMap =
mapEntries.getAliasMap("/parent");
- assertEquals(Collections.emptyMap(), aliasMap);
+ Map<String, Collection<String>> aliasMapAfter =
mapEntries.getAliasMap("/parent");
+ assertEquals(1, aliasMapAfter.size());
+
+ assertEquals(aliasMapBefore, aliasMapAfter);
}
@Test
