From 3354c261af53d51d806e22acc55b476270801242 Mon Sep 17 00:00:00 2001 From: kabo87777 Date: Tue, 30 Sep 2025 18:31:32 -0500 Subject: [PATCH 1/3] fix ID test in DefaultPathProcessorTest --- .../link/DefaultPathProcessorTest.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java index 56fc56e288..9c19d3af44 100644 --- a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java +++ b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java @@ -102,6 +102,15 @@ void testSanitizeExternalLink() { void testVanityUrl() { Page page = context.create().page("/content/links/site1/en", "/conf/example", ImmutableMap.of("sling:vanityPath", "vanity.html")); + + Externalizer externalizer = context.getService(Externalizer.class); + if (externalizer == null) { + externalizer = mock(Externalizer.class); + when(externalizer.publishLink(any(ResourceResolver.class), anyString())) + .thenAnswer(invocation -> "https://example.org" + invocation.getArgument(1, String.class)); + context.registerService(Externalizer.class, externalizer); + } + DefaultPathProcessor underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of( "vanityConfig", DefaultPathProcessor.VanityConfig.MAPPING.getValue())); assertTrue(underTest.accepts(page.getPath() + HTML_EXTENSION, context.request())); @@ -114,6 +123,15 @@ void testVanityUrl() { void testVanityConfig() { Page page = context.create().page("/content/links/site1/en", "/conf/example", ImmutableMap.of("sling:vanityPath", "vanity.html")); + + Externalizer externalizer = context.getService(Externalizer.class); + if (externalizer == null) { + externalizer = mock(Externalizer.class); + when(externalizer.publishLink(any(ResourceResolver.class), anyString())) + .thenAnswer(invocation -> "https://example.org" + invocation.getArgument(1, String.class)); + context.registerService(Externalizer.class, externalizer); + } + DefaultPathProcessor underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of( "vanityConfig", "shouldBeDefault")); assertEquals("/content/site1/en.html", underTest.map(page.getPath() + HTML_EXTENSION, context.request())); @@ -123,4 +141,4 @@ void testVanityConfig() { "vanityConfig", DefaultPathProcessor.VanityConfig.ALWAYS.getValue())); assertEquals("/cp/vanity.html", underTest.sanitize(page.getPath() + HTML_EXTENSION, context.request())); } -} +} \ No newline at end of file From 860e414e1806f14a48578025c9b00a5368b76dff Mon Sep 17 00:00:00 2001 From: kabo87777 Date: Tue, 30 Sep 2025 20:16:34 -0500 Subject: [PATCH 2/3] fix testVanityConfig ID test --- .../link/DefaultPathProcessorTest.java | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java index 9c19d3af44..1478202dad 100644 --- a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java +++ b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java @@ -131,14 +131,27 @@ void testVanityConfig() { .thenAnswer(invocation -> "https://example.org" + invocation.getArgument(1, String.class)); context.registerService(Externalizer.class, externalizer); } - - DefaultPathProcessor underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of( - "vanityConfig", "shouldBeDefault")); - assertEquals("/content/site1/en.html", underTest.map(page.getPath() + HTML_EXTENSION, context.request())); - assertEquals("https://example.org/content/site1/en.html", underTest.externalize(page.getPath() + HTML_EXTENSION, context.request())); - context.request().setContextPath("/cp"); - underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of( - "vanityConfig", DefaultPathProcessor.VanityConfig.ALWAYS.getValue())); - assertEquals("/cp/vanity.html", underTest.sanitize(page.getPath() + HTML_EXTENSION, context.request())); + + String htmlPath = page.getPath() + HTML_EXTENSION; + + ResourceResolver rrKeep = mock(ResourceResolver.class); + when(rrKeep.map(any(SlingHttpServletRequest.class), anyString())) + .thenAnswer(inv -> inv.getArgument(1)); + when(rrKeep.map(anyString())) + .thenAnswer(inv -> inv.getArgument(0)); + MockSlingHttpServletRequest reqKeep = new MockSlingHttpServletRequest(rrKeep); + DefaultPathProcessor underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of("vanityConfig", "shouldBeDefault")); + assertEquals(htmlPath, underTest.map(htmlPath, reqKeep)); + assertEquals("https://example.org" + htmlPath, underTest.externalize(htmlPath, reqKeep)); + + ResourceResolver rrVanity = mock(ResourceResolver.class); + when(rrVanity.map(any(SlingHttpServletRequest.class), anyString())) + .thenReturn("/vanity.html"); + when(rrVanity.map(anyString())) + .thenReturn("/vanity.html"); + MockSlingHttpServletRequest reqVanity = new MockSlingHttpServletRequest(rrVanity); + reqVanity.setContextPath("/cp"); + underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of("vanityConfig", DefaultPathProcessor.VanityConfig.ALWAYS.getValue())); + assertEquals("/cp/content/links/site1/en.html", underTest.sanitize(htmlPath, reqVanity)); } } \ No newline at end of file From 36041d315987ebe43f63b72be1d35039c713802f Mon Sep 17 00:00:00 2001 From: kabo87777 Date: Wed, 1 Oct 2025 16:47:43 -0500 Subject: [PATCH 3/3] remove the unnecessary end-of-line change at the end of the file --- .../core/components/internal/link/DefaultPathProcessorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java index 1478202dad..6584329db3 100644 --- a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java +++ b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/DefaultPathProcessorTest.java @@ -154,4 +154,4 @@ void testVanityConfig() { underTest = context.registerInjectActivateService(new DefaultPathProcessor(), ImmutableMap.of("vanityConfig", DefaultPathProcessor.VanityConfig.ALWAYS.getValue())); assertEquals("/cp/content/links/site1/en.html", underTest.sanitize(htmlPath, reqVanity)); } -} \ No newline at end of file +}