diff --git a/pom.xml b/pom.xml index 37163bd..d1d43c2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.sling sling-bundle-parent - 41 + 48 @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.commons.osgi - 2.1.0 + 2.4.0 provided @@ -145,13 +145,13 @@ org.apache.sling org.apache.sling.jcr.resource - 2.3.8 + 3.3.2 test org.apache.sling org.apache.sling.commons.testing - 2.1.0 + 2.1.2 test @@ -162,32 +162,32 @@ org.apache.sling - org.apache.sling.testing.osgi-mock - 2.3.4 + org.apache.sling.testing.osgi-mock.junit4 + 3.5.0 test org.mockito - mockito-all - 1.10.19 + mockito-core + 5.14.2 test org.apache.jackrabbit - jackrabbit-api - 2.19.2 - test + oak-jackrabbit-api + 1.72.0 + test org.apache.jackrabbit jackrabbit-jcr-commons - 2.19.4 + 2.19.6 test org.apache.jackrabbit jackrabbit-core - 2.19.4 + 2.19.6 test diff --git a/src/test/java/org/apache/sling/scripting/javascript/internal/ScriptEngineHelper.java b/src/test/java/org/apache/sling/scripting/javascript/internal/ScriptEngineHelper.java index 5a434a8..9867d74 100644 --- a/src/test/java/org/apache/sling/scripting/javascript/internal/ScriptEngineHelper.java +++ b/src/test/java/org/apache/sling/scripting/javascript/internal/ScriptEngineHelper.java @@ -33,7 +33,9 @@ import org.apache.sling.commons.testing.osgi.MockBundle; import org.apache.sling.commons.testing.osgi.MockComponentContext; import org.apache.sling.scripting.api.ScriptCache; -import org.mockito.internal.util.reflection.Whitebox; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mozilla.javascript.Context; import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.Wrapper; @@ -43,19 +45,30 @@ /** Helpers to run javascript code fragments in tests */ public class ScriptEngineHelper { + private static ScriptEngine engine; - private static ScriptCache scriptCache = mock(ScriptCache.class); + + @Mock + private static ScriptCache scriptCache; + + @Mock + private static RhinoJavaScriptEngineFactoryConfiguration configuration; + + @InjectMocks + private RhinoJavaScriptEngineFactory factory; + + public ScriptEngineHelper() { + MockitoAnnotations.initMocks(this); + } public static class Data extends HashMap { } - private static ScriptEngine getEngine() { + private ScriptEngine getEngine() { if (engine == null) { synchronized (ScriptEngineHelper.class) { final RhinoMockComponentContext componentContext = new RhinoMockComponentContext(); final RhinoJavaScriptEngineFactoryConfiguration configuration = mock(RhinoJavaScriptEngineFactoryConfiguration.class); - RhinoJavaScriptEngineFactory factory = new RhinoJavaScriptEngineFactory(); - Whitebox.setInternalState(factory, "scriptCache", scriptCache); factory.activate(componentContext, configuration); engine = factory.getScriptEngine(); } diff --git a/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java b/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java index 5d250b5..097443e 100644 --- a/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java +++ b/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java @@ -44,7 +44,7 @@ import org.apache.sling.api.resource.ValueMap; import org.apache.sling.api.wrappers.ValueMapDecorator; import org.apache.sling.commons.testing.sling.MockResourceResolver; -import org.apache.sling.jcr.resource.JcrResourceConstants; +import org.apache.sling.jcr.resource.api.JcrResourceConstants; import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase; import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper; import org.jetbrains.annotations.NotNull;