raducotescu commented on code in PR #26: URL: https://github.com/apache/sling-org-apache-sling-scripting-sightly/pull/26#discussion_r1665862326
########## src/test/java/org/apache/sling/scripting/sightly/impl/utils/ScriptDependencyResolverTest.java: ########## @@ -0,0 +1,148 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ +package org.apache.sling.scripting.sightly.impl.utils; + + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.script.Bindings; + +import org.apache.sling.api.resource.ModifiableValueMap; +import org.apache.sling.api.resource.PersistenceException; +import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ResourceResolver; +import org.apache.sling.api.resource.ResourceUtil; +import org.apache.sling.api.resource.observation.ResourceChange; +import org.apache.sling.api.scripting.SlingBindings; +import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider; +import org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration; +import org.apache.sling.scripting.sightly.render.RenderContext; +import org.apache.sling.testing.mock.sling.junit.SlingContext; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + + +public class ScriptDependencyResolverTest { + + private ScriptDependencyResolver scriptDependencyResolver; + + @Rule + public SlingContext context = new SlingContext(); + + @Before + public void before() throws PersistenceException { + // resource hierarchy + ResourceUtil.getOrCreateResource(context.resourceResolver(), "/apps/base/partial.html", "nt:file", "sling:Folder", true); + ResourceUtil.getOrCreateResource(context.resourceResolver(), "/apps/inherit/inherit.html", "nt:file", "sling:Folder", true); + Resource inherit = context.resourceResolver().getResource("/apps/inherit"); + assertNotNull(inherit); + ModifiableValueMap inheritProperties = inherit.adaptTo(ModifiableValueMap.class); + assertNotNull(inheritProperties); + inheritProperties.put("sling:resourceSuperType", "base"); + context.resourceResolver().commit(); + + Map<String, Object> testResourceProperties = new HashMap<>(); + testResourceProperties.put("sling:resourceType", "inherit"); + ResourceUtil.getOrCreateResource(context.resourceResolver(), "/content/test", testResourceProperties, "sling:Folder", true); + context.request().setResource(context.resourceResolver().getResource("/content/test")); + } + + @Test + public void testDependenciesResolvingCacheDisabled() { + SightlyEngineConfiguration configuration = mock(SightlyEngineConfiguration.class); + when(configuration.getScriptResolutionCacheSize()).thenReturn(0); + context.registerService(configuration); + + ResourceResolver scriptingResolver = spy(context.resourceResolver()); + + ScriptingResourceResolverProvider scriptingResourceResolverProvider = + mock(ScriptingResourceResolverProvider.class); + when(scriptingResourceResolverProvider.getRequestScopedResourceResolver()).thenReturn(scriptingResolver); + context.registerService(ScriptingResourceResolverProvider.class, scriptingResourceResolverProvider); + + scriptDependencyResolver = context.registerInjectActivateService(new ScriptDependencyResolver()); + + RenderContext renderContext = mock(RenderContext.class); + Bindings bindings = mock(Bindings.class); + when(renderContext.getBindings()).thenReturn(bindings); + when(bindings.get(SlingBindings.REQUEST)).thenReturn(context.request()); + + Resource partial = scriptDependencyResolver.resolveScript(renderContext, "partial.html"); + assertNotNull(partial); + partial = scriptDependencyResolver.resolveScript(renderContext, "partial.html"); + assertNotNull(partial); + verify(scriptingResolver, times(8)).getResource(anyString()); + } + + @Test + public void testDependenciesResolvingCacheEnabled() { + SightlyEngineConfiguration configuration = mock(SightlyEngineConfiguration.class); + when(configuration.getScriptResolutionCacheSize()).thenReturn(1024); + context.registerService(configuration); + + ResourceResolver scriptingResolver = spy(context.resourceResolver()); + + ScriptingResourceResolverProvider scriptingResourceResolverProvider = + mock(ScriptingResourceResolverProvider.class); + when(scriptingResourceResolverProvider.getRequestScopedResourceResolver()).thenReturn(scriptingResolver); + context.registerService(ScriptingResourceResolverProvider.class, scriptingResourceResolverProvider); + + scriptDependencyResolver = context.registerInjectActivateService(new ScriptDependencyResolver()); + + RenderContext renderContext = mock(RenderContext.class); + Bindings bindings = mock(Bindings.class); + when(renderContext.getBindings()).thenReturn(bindings); + when(bindings.get(SlingBindings.REQUEST)).thenReturn(context.request()); + + Resource partial = scriptDependencyResolver.resolveScript(renderContext, "partial.html"); + assertNotNull(partial); + partial = scriptDependencyResolver.resolveScript(renderContext, "partial.html"); + assertNotNull(partial); + verify(scriptingResolver, times(5)).getResource(anyString()); + + // simulate a change in the resource tree + List<ResourceChange> changes = new ArrayList<>(); + changes.add(mock(ResourceChange.class)); Review Comment: We're still using Java 8 for now... :) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
