This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 8a8583e SLING-13101 - [Sling Models] Migrate Request, Resource, and
PostConstruct Tests to JUnit 5 (#82)
8a8583e is described below
commit 8a8583eb1a61a4cd4a9df5551d9dc7a071a22d52
Author: Bhavik Kothari <[email protected]>
AuthorDate: Fri Feb 13 20:24:35 2026 +0530
SLING-13101 - [Sling Models] Migrate Request, Resource, and PostConstruct
Tests to JUnit 5 (#82)
---
.../ParameterizedTypeFromRequestAttributeTest.java | 24 ++++-----
.../sling/models/impl/PostConstructTest.java | 55 ++++++++++----------
.../sling/models/impl/ReflectionUtilTest.java | 24 ++++-----
.../sling/models/impl/RequestDisposalTest.java | 30 +++++------
.../sling/models/impl/RequestInjectionTest.java | 28 +++++------
.../sling/models/impl/RequestWrapperTest.java | 24 +++++----
.../models/impl/ResourceModelClassesTest.java | 58 +++++++++++-----------
.../models/impl/ResourceModelConstructorTest.java | 24 ++++-----
.../models/impl/ResourceModelInterfacesTest.java | 40 +++++++--------
...esourceOverridingJakartaRequestWrapperTest.java | 44 +++++++++-------
.../impl/ResourceOverridingRequestWrapperTest.java | 42 +++++++++-------
.../models/impl/ResourcePathInjectionTest.java | 54 ++++++++++----------
12 files changed, 230 insertions(+), 217 deletions(-)
diff --git
a/src/test/java/org/apache/sling/models/impl/ParameterizedTypeFromRequestAttributeTest.java
b/src/test/java/org/apache/sling/models/impl/ParameterizedTypeFromRequestAttributeTest.java
index 5f1dd8e..b268268 100644
---
a/src/test/java/org/apache/sling/models/impl/ParameterizedTypeFromRequestAttributeTest.java
+++
b/src/test/java/org/apache/sling/models/impl/ParameterizedTypeFromRequestAttributeTest.java
@@ -27,25 +27,25 @@ import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.impl.injectors.RequestAttributeInjector;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ParameterizedTypeFromRequestAttributeTest {
+@ExtendWith(MockitoExtension.class)
+class ParameterizedTypeFromRequestAttributeTest {
private ModelAdapterFactory factory;
@Mock
private SlingJakartaHttpServletRequest request;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
RequestAttributeInjector injector = new RequestAttributeInjector();
@@ -54,7 +54,7 @@ public class ParameterizedTypeFromRequestAttributeTest {
}
@Test
- public void test() {
+ void test() {
Iterator<Resource> it = Collections.<Resource>emptySet().iterator();
when(request.getAttribute("someResources")).thenReturn(it);
@@ -64,7 +64,7 @@ public class ParameterizedTypeFromRequestAttributeTest {
}
@Model(adaptables = SlingJakartaHttpServletRequest.class)
- public static class TestModel {
+ static class TestModel {
@Inject
private Iterator<Resource> someResources;
diff --git a/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
b/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
index e3c7af4..cd9e3ad 100644
--- a/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
+++ b/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
@@ -25,28 +25,29 @@ import
org.apache.sling.models.testmodels.classes.FalsePostConstructModel;
import org.apache.sling.models.testmodels.classes.SubClass;
import
org.apache.sling.models.testmodels.classes.SubClassOverriddenPostConstruct;
import org.apache.sling.models.testmodels.classes.TruePostConstructModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@RunWith(MockitoJUnitRunner.class)
-public class PostConstructTest {
+@ExtendWith(MockitoExtension.class)
+class PostConstructTest {
@Mock
private Resource resource;
private ModelAdapterFactory factory;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
// no injectors are necessary
factory.adapterImplementations.addClassesAsAdapterAndImplementation(
@@ -58,60 +59,60 @@ public class PostConstructTest {
}
@Test
- public void testClassOrder() {
+ void testClassOrder() {
SubClass sc = factory.getAdapter(resource, SubClass.class);
assertTrue(sc.getPostConstructCalledTimestampInSub() >
sc.getPostConstructCalledTimestampInSuper());
assertTrue(sc.getPostConstructCalledTimestampInSuper() > 0);
}
@Test
- public void testOverriddenPostConstruct() {
+ void testOverriddenPostConstruct() {
SubClassOverriddenPostConstruct sc = factory.getAdapter(resource,
SubClassOverriddenPostConstruct.class);
assertEquals(
- "Post construct not called exactly one time in sub class!", 1,
sc.getPostConstructorCalledCounter());
+ 1, sc.getPostConstructorCalledCounter(), "Post construct not
called exactly one time in sub class!");
assertEquals(
- "Post construct was called on super class although overridden
in sub class",
0,
- sc.getPostConstructCalledTimestampInSuper());
+ sc.getPostConstructCalledTimestampInSuper(),
+ "Post construct was called on super class although overridden
in sub class");
}
@Test
- public void testPostConstructMethodWhichThrowsException() {
+ void testPostConstructMethodWhichThrowsException() {
FailingPostConstructModel model = factory.getAdapter(resource,
FailingPostConstructModel.class);
assertNull(model);
}
@Test
- public void testPostConstructMethodWhichReturnsFalse() {
+ void testPostConstructMethodWhichReturnsFalse() {
FalsePostConstructModel model = factory.getAdapter(resource,
FalsePostConstructModel.class);
assertNull(model);
}
@Test
- public void testPostConstructMethodWhichReturnsTrue() {
+ void testPostConstructMethodWhichReturnsTrue() {
TruePostConstructModel model = factory.getAdapter(resource,
TruePostConstructModel.class);
assertNotNull(model);
}
- @Test(expected = PostConstructException.class)
- public void testPostConstructMethodWhichReturnsFalseCreateModel() {
- factory.createModel(resource, FalsePostConstructModel.class);
+ @Test
+ void testPostConstructMethodWhichReturnsFalseCreateModel() {
+ assertThrows(PostConstructException.class, () ->
factory.createModel(resource, FalsePostConstructModel.class));
}
- public void testPostConstructMethodWhichReturnsFalseInternalCreateModel() {
+ void testPostConstructMethodWhichReturnsFalseInternalCreateModel() {
assertSame(
Result.POST_CONSTRUCT_PREVENTED_MODEL_CONSTRUCTION,
factory.internalCreateModel(resource,
FalsePostConstructModel.class));
}
@Test
- public void testPostConstructMethodWhichReturnsTrueCreateModel() {
+ void testPostConstructMethodWhichReturnsTrueCreateModel() {
TruePostConstructModel model = factory.createModel(resource,
TruePostConstructModel.class);
assertNotNull(model);
}
@Test
- public void testPostConstructMethodWhichThrowsExceptionThrowingException()
{
+ void testPostConstructMethodWhichThrowsExceptionThrowingException() {
boolean thrown = false;
try {
factory.createModel(resource, FailingPostConstructModel.class);
diff --git a/src/test/java/org/apache/sling/models/impl/ReflectionUtilTest.java
b/src/test/java/org/apache/sling/models/impl/ReflectionUtilTest.java
index aec4752..1dccb0f 100644
--- a/src/test/java/org/apache/sling/models/impl/ReflectionUtilTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ReflectionUtilTest.java
@@ -20,10 +20,10 @@ package org.apache.sling.models.impl;
import java.lang.reflect.Constructor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@SuppressWarnings({
"PackageVisibleInnerClass",
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
"InstanceVariableMayNotBeInitialized",
"PublicConstructorInNonPublicClass"
})
-public class ReflectionUtilTest {
+class ReflectionUtilTest {
static class TestClassOne {
private final int field1;
@@ -104,49 +104,49 @@ public class ReflectionUtilTest {
}
@Test
- public void testBalancedConstructor() throws NoSuchMethodException {
+ void testBalancedConstructor() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassOne.class.getConstructor(int.class, String.class);
assertTrue(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testMoreFieldsThanParams() throws NoSuchMethodException {
+ void testMoreFieldsThanParams() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassTwo.class.getConstructor(int.class, String.class);
assertFalse(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testMoreParamsThanFields() throws NoSuchMethodException {
+ void testMoreParamsThanFields() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassThree.class.getConstructor(int.class, String.class);
assertFalse(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testNoFields() throws NoSuchMethodException {
+ void testNoFields() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassFour.class.getConstructor(int.class, String.class, boolean.class);
assertFalse(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testOneFieldOneParam() throws NoSuchMethodException {
+ void testOneFieldOneParam() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassFive.class.getConstructor(int.class);
assertTrue(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testNoParams() throws NoSuchMethodException {
+ void testNoParams() throws NoSuchMethodException {
Constructor<?> constructor = TestClassSix.class.getConstructor();
assertFalse(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testBalancedRepeatableTypes() throws NoSuchMethodException {
+ void testBalancedRepeatableTypes() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassSeven.class.getConstructor(String.class, String.class);
assertTrue(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
@Test
- public void testUnbalancedRepeatableTypes() throws NoSuchMethodException {
+ void testUnbalancedRepeatableTypes() throws NoSuchMethodException {
Constructor<?> constructor =
TestClassEight.class.getConstructor(String.class, String.class);
assertFalse(ReflectionUtil.areBalancedCtorParamsAndFields(constructor));
}
diff --git
a/src/test/java/org/apache/sling/models/impl/RequestDisposalTest.java
b/src/test/java/org/apache/sling/models/impl/RequestDisposalTest.java
index ba9c85a..c9a3411 100644
--- a/src/test/java/org/apache/sling/models/impl/RequestDisposalTest.java
+++ b/src/test/java/org/apache/sling/models/impl/RequestDisposalTest.java
@@ -39,23 +39,22 @@ import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.apache.sling.models.spi.Injector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
-@RunWith(MockitoJUnitRunner.class)
-public class RequestDisposalTest {
+@ExtendWith(MockitoExtension.class)
+class RequestDisposalTest {
@Mock
private Resource resource;
@@ -69,15 +68,16 @@ public class RequestDisposalTest {
private Set<TestDisposalCallback> callbacks;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Arrays.asList(new DisposedInjector());
factory.adapterImplementations.addClassesAsAdapterAndImplementation(TestModel.class);
final Map<String, Object> attributes = new HashMap<>();
- doAnswer(new Answer<Void>() {
+ lenient()
+ .doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) {
@@ -90,7 +90,7 @@ public class RequestDisposalTest {
.when(request)
.setAttribute(any(String.class), any());
- when(request.getAttribute(any(String.class))).then(new
Answer<Object>() {
+ lenient().when(request.getAttribute(any(String.class))).then(new
Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) {
@@ -101,7 +101,7 @@ public class RequestDisposalTest {
}
@Test
- public void testWithInitializedRequest() {
+ void testWithInitializedRequest() {
// destroy a wrapper of the root request
SlingJakartaHttpServletRequest destroyedRequest = new
SlingJakartaHttpServletRequestWrapper(request);
factory.requestInitialized(new ServletRequestEvent(servletContext,
destroyedRequest));
@@ -121,7 +121,7 @@ public class RequestDisposalTest {
}
@Test
- public void testTwoInstancesWithInitializedRequest() {
+ void testTwoInstancesWithInitializedRequest() {
// destroy a wrapper of the root request
SlingJakartaHttpServletRequest destroyedRequest = new
SlingJakartaHttpServletRequestWrapper(request);
factory.requestInitialized(new ServletRequestEvent(servletContext,
destroyedRequest));
@@ -144,7 +144,7 @@ public class RequestDisposalTest {
}
@Test
- public void testWithUnitializedRequest() {
+ void testWithUnitializedRequest() {
// destroy a wrapper of the root request
SlingJakartaHttpServletRequest destroyedRequest = new
SlingJakartaHttpServletRequestWrapper(request);
diff --git
a/src/test/java/org/apache/sling/models/impl/RequestInjectionTest.java
b/src/test/java/org/apache/sling/models/impl/RequestInjectionTest.java
index 4f8a6fb..c9621fb 100644
--- a/src/test/java/org/apache/sling/models/impl/RequestInjectionTest.java
+++ b/src/test/java/org/apache/sling/models/impl/RequestInjectionTest.java
@@ -25,21 +25,21 @@ import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.models.impl.injectors.BindingsInjector;
import org.apache.sling.models.testmodels.classes.BindingsModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class RequestInjectionTest {
+@ExtendWith(MockitoExtension.class)
+class RequestInjectionTest {
private ModelAdapterFactory factory;
@@ -49,12 +49,12 @@ public class RequestInjectionTest {
@Mock
private SlingScriptHelper sling;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
SlingBindings bindings = new SlingBindings();
bindings.setSling(sling);
bindings.setLog(LoggerFactory.getLogger("test"));
-
when(request.getAttribute(SlingBindings.class.getName())).thenReturn(bindings);
+
lenient().when(request.getAttribute(SlingBindings.class.getName())).thenReturn(bindings);
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Arrays.asList(new BindingsInjector());
@@ -64,7 +64,7 @@ public class RequestInjectionTest {
}
@Test
- public void testNamedInjectionField() {
+ void testNamedInjectionField() {
BindingsModel model = factory.getAdapter(request, BindingsModel.class);
assertNotNull(model.getSling());
assertEquals(sling, model.getSling());
@@ -73,7 +73,7 @@ public class RequestInjectionTest {
}
@Test
- public void testNamedInjectionConstructor() {
+ void testNamedInjectionConstructor() {
org.apache.sling.models.testmodels.classes.constructorinjection.BindingsModel
model = factory.getAdapter(
request,
org.apache.sling.models.testmodels.classes.constructorinjection.BindingsModel.class);
assertNotNull(model.getSling());
diff --git a/src/test/java/org/apache/sling/models/impl/RequestWrapperTest.java
b/src/test/java/org/apache/sling/models/impl/RequestWrapperTest.java
index b880314..ea0d027 100644
--- a/src/test/java/org/apache/sling/models/impl/RequestWrapperTest.java
+++ b/src/test/java/org/apache/sling/models/impl/RequestWrapperTest.java
@@ -29,24 +29,25 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.scripting.api.BindingsValuesProvider;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatcher;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class RequestWrapperTest {
+@ExtendWith(MockitoExtension.class)
+class RequestWrapperTest {
@Mock
private AdapterManager adapterManager;
@@ -66,18 +67,19 @@ public class RequestWrapperTest {
@InjectMocks
private ModelAdapterFactory factory;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.bindingsValuesProvidersByContext =
bindingsValuesProvidersByContext;
factory.adapterManager = adapterManager;
- when(bindingsValuesProvidersByContext.getBindingsValuesProviders(
+ lenient()
+
.when(bindingsValuesProvidersByContext.getBindingsValuesProviders(
any(ScriptEngineFactory.class),
eq(BindingsValuesProvider.DEFAULT_CONTEXT)))
.thenReturn(Collections.singleton(bindingsValuesProvider));
}
@Test
- public void testWrapper() {
+ void testWrapper() {
Target expected = new Target();
when(adapterManager.getAdapter(any(SlingJakartaHttpServletRequest.class),
eq(Target.class)))
.thenReturn(expected);
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourceModelClassesTest.java
b/src/test/java/org/apache/sling/models/impl/ResourceModelClassesTest.java
index 2a6a018..23c24e9 100644
--- a/src/test/java/org/apache/sling/models/impl/ResourceModelClassesTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ResourceModelClassesTest.java
@@ -44,17 +44,17 @@ import
org.apache.sling.models.testmodels.classes.ParentModel;
import
org.apache.sling.models.testmodels.classes.ResourceModelWithRequiredField;
import
org.apache.sling.models.testmodels.classes.ResourceModelWithRequiredFieldOptionalStrategy;
import org.apache.sling.models.testmodels.classes.SimplePropertyModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -63,13 +63,13 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@SuppressWarnings("deprecation")
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceModelClassesTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceModelClassesTest {
private ModelAdapterFactory factory;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
ValueMapInjector valueMapInjector = new ValueMapInjector();
factory.injectors = Arrays.asList(new ChildResourceInjector(),
valueMapInjector);
@@ -92,11 +92,11 @@ public class ResourceModelClassesTest {
}
@Test
- public void testSimplePropertyModel() {
+ void testSimplePropertyModel() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
map.put("third", "third-value");
- map.put("intProperty", new Integer(3));
+ map.put("intProperty", Integer.valueOf(3));
map.put("arrayProperty", new String[] {"three", "four"});
ValueMap vm = new ValueMapDecorator(map);
@@ -120,7 +120,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testArrayPrimitivesModel() {
+ void testArrayPrimitivesModel() {
Map<String, Object> map = new HashMap<>();
map.put("intArray", new int[] {1, 2, 9, 8});
map.put("secondIntArray", new Integer[] {1, 2, 9, 8});
@@ -142,7 +142,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testArrayWrappersModel() {
+ void testArrayWrappersModel() {
Map<String, Object> map = new HashMap<>();
map.put("intArray", new Integer[] {1, 2, 9, 8});
map.put("secondIntArray", new int[] {1, 2, 9, 8});
@@ -156,15 +156,15 @@ public class ResourceModelClassesTest {
Integer[] intArray = model.getIntArray();
assertEquals(4, intArray.length);
- assertEquals(new Integer(2), intArray[1]);
+ assertEquals(Integer.valueOf(2), intArray[1]);
Integer[] secondIntArray = model.getSecondIntArray();
assertEquals(4, secondIntArray.length);
- assertEquals(new Integer(2), secondIntArray[1]);
+ assertEquals(Integer.valueOf(2), secondIntArray[1]);
}
@Test
- public void testListModel() {
+ void testListModel() {
Map<String, Object> map = new HashMap<>();
map.put("intList", new Integer[] {1, 2, 9, 8});
map.put("stringList", new String[] {"hello", "world"});
@@ -177,7 +177,7 @@ public class ResourceModelClassesTest {
assertNotNull(model);
assertEquals(4, model.getIntList().size());
- assertEquals(new Integer(2), model.getIntList().get(1));
+ assertEquals(Integer.valueOf(2), model.getIntList().get(1));
assertEquals(2, model.getStringList().size());
assertEquals("hello", model.getStringList().get(0));
@@ -186,7 +186,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testListDefaultsModel() {
+ void testListDefaultsModel() {
Map<String, Object> map = new HashMap<>();
ValueMap vm = new ValueMapDecorator(map);
@@ -206,7 +206,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testCollectionDefaultsModel() {
+ void testCollectionDefaultsModel() {
Map<String, Object> map = new HashMap<>();
ValueMap vm = new ValueMapDecorator(map);
@@ -222,7 +222,7 @@ public class ResourceModelClassesTest {
@SuppressWarnings({"unused", "null"})
@Test
- public void testRequiredPropertyModel() {
+ void testRequiredPropertyModel() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
map.put("third", "third-value");
@@ -238,7 +238,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testRequiredPropertyModelWithException() {
+ void testRequiredPropertyModelWithException() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
map.put("third", "third-value");
@@ -263,7 +263,7 @@ public class ResourceModelClassesTest {
@SuppressWarnings({"unused", "null"})
@Test
- public void testRequiredPropertyMissingModelOptionalStrategy() {
+ void testRequiredPropertyMissingModelOptionalStrategy() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
ValueMap vm = spy(new ValueMapDecorator(map));
@@ -280,7 +280,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testRequiredPropertyModelOptionalStrategy() {
+ void testRequiredPropertyModelOptionalStrategy() {
Map<String, Object> map = new HashMap<>();
map.put("required1", "required value");
map.put("required2", "required value");
@@ -301,7 +301,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testChildResource() {
+ void testChildResource() {
Resource child = mock(Resource.class);
Resource secondChild = mock(Resource.class);
Resource emptyChild = mock(Resource.class);
@@ -328,7 +328,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testChildValueMap() {
+ void testChildValueMap() {
ValueMap map = ValueMapDecorator.EMPTY;
Resource child = mock(Resource.class);
@@ -343,7 +343,7 @@ public class ResourceModelClassesTest {
}
@Test
- public void testChildModel() {
+ void testChildModel() {
Object firstValue = RandomStringUtils.randomAlphabetic(10);
ValueMap firstMap = new
ValueMapDecorator(Collections.singletonMap("property", firstValue));
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourceModelConstructorTest.java
b/src/test/java/org/apache/sling/models/impl/ResourceModelConstructorTest.java
index 42c0857..077e08f 100644
---
a/src/test/java/org/apache/sling/models/impl/ResourceModelConstructorTest.java
+++
b/src/test/java/org/apache/sling/models/impl/ResourceModelConstructorTest.java
@@ -29,11 +29,11 @@ import
org.apache.sling.models.impl.injectors.ChildResourceInjector;
import org.apache.sling.models.impl.injectors.ValueMapInjector;
import org.apache.sling.models.testmodels.classes.ChildModel;
import
org.apache.sling.models.testmodels.classes.constructorinjection.ParentModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertEquals;
@@ -41,30 +41,30 @@ import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceModelConstructorTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceModelConstructorTest {
private ModelAdapterFactory factory;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Arrays.asList(new ChildResourceInjector(), new
ValueMapInjector());
factory.adapterImplementations.addClassesAsAdapterAndImplementation(ParentModel.class,
ChildModel.class);
}
@Test
- public void testChildModel() {
- Object firstValue = RandomStringUtils.randomAlphabetic(10);
+ void testChildModel() {
+ Object firstValue =
RandomStringUtils.secureStrong().nextAlphabetic(10);
ValueMap firstMap = new
ValueMapDecorator(Collections.singletonMap("property", firstValue));
final Resource firstChild = mock(Resource.class);
lenient().when(firstChild.adaptTo(ValueMap.class)).thenReturn(firstMap);
lenient().when(firstChild.adaptTo(ChildModel.class)).thenAnswer(new
AdaptToChildModel());
- Object firstGrandChildValue = RandomStringUtils.randomAlphabetic(10);
+ Object firstGrandChildValue =
RandomStringUtils.secureStrong().nextAlphabetic(10);
ValueMap firstGrandChildMap = new
ValueMapDecorator(Collections.singletonMap("property", firstGrandChildValue));
- Object secondGrandChildValue = RandomStringUtils.randomAlphabetic(10);
+ Object secondGrandChildValue =
RandomStringUtils.secureStrong().nextAlphabetic(10);
ValueMap secondGrandChildMap =
new ValueMapDecorator(Collections.singletonMap("property",
secondGrandChildValue));
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourceModelInterfacesTest.java
b/src/test/java/org/apache/sling/models/impl/ResourceModelInterfacesTest.java
index d673152..f18372a 100644
---
a/src/test/java/org/apache/sling/models/impl/ResourceModelInterfacesTest.java
+++
b/src/test/java/org/apache/sling/models/impl/ResourceModelInterfacesTest.java
@@ -35,17 +35,17 @@ import
org.apache.sling.models.testmodels.interfaces.ChildResourceModel;
import org.apache.sling.models.testmodels.interfaces.ChildValueMapModel;
import org.apache.sling.models.testmodels.interfaces.ParentModel;
import org.apache.sling.models.testmodels.interfaces.SimplePropertyModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -53,13 +53,13 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceModelInterfacesTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceModelInterfacesTest {
private ModelAdapterFactory factory;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Arrays.asList(new ChildResourceInjector(), new
ValueMapInjector());
factory.adapterImplementations.addClassesAsAdapterAndImplementation(
@@ -72,7 +72,7 @@ public class ResourceModelInterfacesTest {
}
@Test
- public void testSimplePropertyModel() {
+ void testSimplePropertyModel() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
map.put("third", "third-value");
@@ -94,7 +94,7 @@ public class ResourceModelInterfacesTest {
@Test
@SuppressWarnings({"unused", "null"})
- public void testRequiredPropertyModel() {
+ void testRequiredPropertyModel() {
Map<String, Object> map = new HashMap<>();
map.put("first", "first-value");
map.put("third", "third-value");
@@ -110,7 +110,7 @@ public class ResourceModelInterfacesTest {
}
@Test
- public void testChildResource() {
+ void testChildResource() {
Resource child = mock(Resource.class);
Resource res = mock(Resource.class);
@@ -122,7 +122,7 @@ public class ResourceModelInterfacesTest {
}
@Test
- public void testChildValueMap() {
+ void testChildValueMap() {
ValueMap map = ValueMapDecorator.EMPTY;
Resource child = mock(Resource.class);
@@ -137,8 +137,8 @@ public class ResourceModelInterfacesTest {
}
@Test
- public void testChildModel() {
- Object value = RandomStringUtils.randomAlphabetic(10);
+ void testChildModel() {
+ Object value = RandomStringUtils.secureStrong().nextAlphabetic(10);
Map<String, Object> props = Collections.singletonMap("property",
value);
ValueMap map = new ValueMapDecorator(props);
@@ -146,9 +146,9 @@ public class ResourceModelInterfacesTest {
lenient().when(firstChild.adaptTo(ValueMap.class)).thenReturn(map);
lenient().when(firstChild.adaptTo(ChildModel.class)).thenAnswer(new
AdaptToChildModel());
- Object firstGrandChildValue = RandomStringUtils.randomAlphabetic(10);
+ Object firstGrandChildValue =
RandomStringUtils.secureStrong().nextAlphabetic(10);
ValueMap firstGrandChildMap = new
ValueMapDecorator(Collections.singletonMap("property", firstGrandChildValue));
- Object secondGrandChildValue = RandomStringUtils.randomAlphabetic(10);
+ Object secondGrandChildValue =
RandomStringUtils.secureStrong().nextAlphabetic(10);
ValueMap secondGrandChildMap =
new ValueMapDecorator(Collections.singletonMap("property",
secondGrandChildValue));
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourceOverridingJakartaRequestWrapperTest.java
b/src/test/java/org/apache/sling/models/impl/ResourceOverridingJakartaRequestWrapperTest.java
index f1a8acb..5aeae0d 100644
---
a/src/test/java/org/apache/sling/models/impl/ResourceOverridingJakartaRequestWrapperTest.java
+++
b/src/test/java/org/apache/sling/models/impl/ResourceOverridingJakartaRequestWrapperTest.java
@@ -23,22 +23,24 @@ import org.apache.sling.api.adapter.AdapterManager;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Test.None;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
/**
*
*/
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceOverridingJakartaRequestWrapperTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceOverridingJakartaRequestWrapperTest {
private ResourceOverridingJakartaRequestWrapper wrapper = null;
@@ -48,12 +50,14 @@ public class ResourceOverridingJakartaRequestWrapperTest {
@Mock
private Resource resource;
- @Before
- public void setup() {
-
Mockito.when(jakartaRequest.getAttribute("attr1")).thenReturn("value1");
+ @BeforeEach
+ void setup() {
+
lenient().when(jakartaRequest.getAttribute("attr1")).thenReturn("value1");
SlingBindings mockSlingBindings = Mockito.mock(SlingBindings.class);
-
Mockito.when(jakartaRequest.getAttribute(SlingBindings.class.getName())).thenReturn(mockSlingBindings);
+ lenient()
+
.when(jakartaRequest.getAttribute(SlingBindings.class.getName()))
+ .thenReturn(mockSlingBindings);
AdapterManager mockAdapterManager = Mockito.mock(AdapterManager.class);
SlingModelsScriptEngineFactory mockScriptEngineFactory =
Mockito.mock(SlingModelsScriptEngineFactory.class);
@@ -61,25 +65,27 @@ public class ResourceOverridingJakartaRequestWrapperTest {
wrapper = new ResourceOverridingJakartaRequestWrapper(
jakartaRequest, resource, mockAdapterManager,
mockScriptEngineFactory, mockProvidersByContext);
- Mockito.when(mockAdapterManager.getAdapter(wrapper,
String.class)).thenReturn("Adapted1");
+ lenient().when(mockAdapterManager.getAdapter(wrapper,
String.class)).thenReturn("Adapted1");
}
- @Test(expected = None.class)
- public void testCtorWithoutSlingBindings() {
-
Mockito.when(jakartaRequest.getAttribute(SlingBindings.class.getName())).thenReturn(null);
+ @Test
+ void testCtorWithoutSlingBindings() {
+
when(jakartaRequest.getAttribute(SlingBindings.class.getName())).thenReturn(null);
AdapterManager mockAdapterManager = Mockito.mock(AdapterManager.class);
SlingModelsScriptEngineFactory mockScriptEngineFactory =
Mockito.mock(SlingModelsScriptEngineFactory.class);
BindingsValuesProvidersByContext mockProvidersByContext =
Mockito.mock(BindingsValuesProvidersByContext.class);
- new ResourceOverridingJakartaRequestWrapper(
+ wrapper = new ResourceOverridingJakartaRequestWrapper(
jakartaRequest, resource, mockAdapterManager,
mockScriptEngineFactory, mockProvidersByContext);
+ assertNotNull(wrapper);
+ assertNotNull(wrapper.getAttribute(SlingBindings.class.getName()));
}
/**
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingJakartaRequestWrapper#getAttribute(java.lang.String)}.
*/
@Test
- public void testGetAttributeString() {
+ void testGetAttributeString() {
assertEquals("value1", wrapper.getAttribute("attr1"));
assertTrue(wrapper.getAttribute(SlingBindings.class.getName())
instanceof SlingBindings);
}
@@ -88,7 +94,7 @@ public class ResourceOverridingJakartaRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingJakartaRequestWrapper#getResource()}.
*/
@Test
- public void testGetResource() {
+ void testGetResource() {
assertEquals(resource, wrapper.getResource());
}
@@ -96,7 +102,7 @@ public class ResourceOverridingJakartaRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingJakartaRequestWrapper#adaptTo(java.lang.Class)}.
*/
@Test
- public void testAdaptToClassOfAdapterType() {
+ void testAdaptToClassOfAdapterType() {
assertEquals("Adapted1", wrapper.adaptTo(String.class));
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapperTest.java
b/src/test/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapperTest.java
index 31369c5..7f991fd 100644
---
a/src/test/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapperTest.java
+++
b/src/test/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapperTest.java
@@ -23,23 +23,24 @@ import org.apache.sling.api.adapter.AdapterManager;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Test.None;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.lenient;
/**
* @deprecated use {@link ResourceOverridingJakartaRequestWrapperTest} instead
*/
@Deprecated
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceOverridingRequestWrapperTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceOverridingRequestWrapperTest {
private ResourceOverridingRequestWrapper wrapper = null;
@@ -49,12 +50,12 @@ public class ResourceOverridingRequestWrapperTest {
@Mock
private Resource resource;
- @Before
- public void setup() {
- Mockito.when(javaxRequest.getAttribute("attr1")).thenReturn("value1");
+ @BeforeEach
+ void setup() {
+
lenient().when(javaxRequest.getAttribute("attr1")).thenReturn("value1");
SlingBindings mockSlingBindings = Mockito.mock(SlingBindings.class);
-
Mockito.when(javaxRequest.getAttribute(SlingBindings.class.getName())).thenReturn(mockSlingBindings);
+
lenient().when(javaxRequest.getAttribute(SlingBindings.class.getName())).thenReturn(mockSlingBindings);
AdapterManager mockAdapterManager = Mockito.mock(AdapterManager.class);
SlingModelsScriptEngineFactory mockScriptEngineFactory =
Mockito.mock(SlingModelsScriptEngineFactory.class);
@@ -62,25 +63,28 @@ public class ResourceOverridingRequestWrapperTest {
wrapper = new ResourceOverridingRequestWrapper(
javaxRequest, resource, mockAdapterManager,
mockScriptEngineFactory, mockProvidersByContext);
- Mockito.when(mockAdapterManager.getAdapter(wrapper,
String.class)).thenReturn("Adapted1");
+ lenient().when(mockAdapterManager.getAdapter(wrapper,
String.class)).thenReturn("Adapted1");
}
- @Test(expected = None.class)
- public void testCtorWithoutSlingBindings() {
-
Mockito.when(javaxRequest.getAttribute(SlingBindings.class.getName())).thenReturn(null);
+ @Test
+ void testCtorWithoutSlingBindings() {
+
lenient().when(javaxRequest.getAttribute(SlingBindings.class.getName())).thenReturn(null);
AdapterManager mockAdapterManager = Mockito.mock(AdapterManager.class);
SlingModelsScriptEngineFactory mockScriptEngineFactory =
Mockito.mock(SlingModelsScriptEngineFactory.class);
BindingsValuesProvidersByContext mockProvidersByContext =
Mockito.mock(BindingsValuesProvidersByContext.class);
- new ResourceOverridingRequestWrapper(
+ wrapper = new ResourceOverridingRequestWrapper(
javaxRequest, resource, mockAdapterManager,
mockScriptEngineFactory, mockProvidersByContext);
+
+ assertNotNull(wrapper);
+ assertNotNull(wrapper.getAttribute(SlingBindings.class.getName()));
}
/**
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingRequestWrapper#getAttribute(java.lang.String)}.
*/
@Test
- public void testGetAttributeString() {
+ void testGetAttributeString() {
assertEquals("value1", wrapper.getAttribute("attr1"));
assertTrue(wrapper.getAttribute(SlingBindings.class.getName())
instanceof SlingBindings);
}
@@ -89,7 +93,7 @@ public class ResourceOverridingRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingRequestWrapper#getResource()}.
*/
@Test
- public void testGetResource() {
+ void testGetResource() {
assertEquals(resource, wrapper.getResource());
}
@@ -97,7 +101,7 @@ public class ResourceOverridingRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.ResourceOverridingRequestWrapper#adaptTo(java.lang.Class)}.
*/
@Test
- public void testAdaptToClassOfAdapterType() {
+ void testAdaptToClassOfAdapterType() {
assertEquals("Adapted1", wrapper.adaptTo(String.class));
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/ResourcePathInjectionTest.java
b/src/test/java/org/apache/sling/models/impl/ResourcePathInjectionTest.java
index 9124218..792c9ea 100644
--- a/src/test/java/org/apache/sling/models/impl/ResourcePathInjectionTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ResourcePathInjectionTest.java
@@ -35,22 +35,22 @@ import
org.apache.sling.models.testmodels.classes.ResourcePathAllOptionalModel;
import org.apache.sling.models.testmodels.classes.ResourcePathModel;
import org.apache.sling.models.testmodels.classes.ResourcePathModelWrapping;
import org.apache.sling.models.testmodels.classes.ResourcePathPartialModel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ResourcePathInjectionTest {
+@ExtendWith(MockitoExtension.class)
+class ResourcePathInjectionTest {
private ModelAdapterFactory factory;
@Mock
@@ -74,8 +74,8 @@ public class ResourcePathInjectionTest {
@Mock
private ResourceResolver resourceResolver;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
Map<String, Object> map = new HashMap<String, Object>();
map.put("propertyContainingAPath", "/some/other/path");
map.put("anotherPropertyContainingAPath", "/some/other/path2");
@@ -92,16 +92,16 @@ public class ResourcePathInjectionTest {
ValueMap properties = new ValueMapDecorator(map);
-
when(adaptableResource.getResourceResolver()).thenReturn(resourceResolver);
- when(adaptableResource.adaptTo(ValueMap.class)).thenReturn(properties);
+
lenient().when(adaptableResource.getResourceResolver()).thenReturn(resourceResolver);
+
lenient().when(adaptableResource.adaptTo(ValueMap.class)).thenReturn(properties);
-
when(resourceResolver.getResource("/some/path")).thenReturn(byPathResource);
-
when(resourceResolver.getResource("/some/path2")).thenReturn(byPathResource2);
-
when(resourceResolver.getResource("/some/other/path")).thenReturn(byPropertyValueResource);
-
when(resourceResolver.getResource("/some/other/path2")).thenReturn(byPropertyValueResource2);
+
lenient().when(resourceResolver.getResource("/some/path")).thenReturn(byPathResource);
+
lenient().when(resourceResolver.getResource("/some/path2")).thenReturn(byPathResource2);
+
lenient().when(resourceResolver.getResource("/some/other/path")).thenReturn(byPropertyValueResource);
+
lenient().when(resourceResolver.getResource("/some/other/path2")).thenReturn(byPropertyValueResource2);
- when(adaptableRequest.getResource()).thenReturn(byPathResource);
-
when(adaptableRequest.getResourceResolver()).thenReturn(resourceResolver);
+
lenient().when(adaptableRequest.getResource()).thenReturn(byPathResource);
+
lenient().when(adaptableRequest.getResourceResolver()).thenReturn(resourceResolver);
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Arrays.asList(new SelfInjector(), new
ValueMapInjector(), new ResourcePathInjector());
@@ -115,7 +115,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testPathInjectionFromResource() {
+ void testPathInjectionFromResource() {
ResourcePathModel model = factory.getAdapter(adaptableResource,
ResourcePathModel.class);
assertNotNull(model);
assertEquals(byPathResource, model.getFromPath());
@@ -125,7 +125,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testPathInjectionFromRequest() {
+ void testPathInjectionFromRequest() {
// return the same properties through this request's resource, as
through adaptableResource
doReturn(adaptableResource.adaptTo(ValueMap.class)).when(byPathResource).adaptTo(ValueMap.class);
ResourcePathModel model = factory.getAdapter(adaptableRequest,
ResourcePathModel.class);
@@ -137,7 +137,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testOptionalPathInjectionWithNonResourceAdaptable() {
+ void testOptionalPathInjectionWithNonResourceAdaptable() {
ResourcePathAllOptionalModel model =
factory.getAdapter(adaptableRequest, ResourcePathAllOptionalModel.class);
// should not be null because resource paths fields are optional
assertNotNull(model);
@@ -149,7 +149,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testMultiplePathInjection() {
+ void testMultiplePathInjection() {
ResourcePathModel model = factory.getAdapter(adaptableResource,
ResourcePathModel.class);
assertNotNull(model);
List<Resource> resources = model.getMultipleResources();
@@ -175,7 +175,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testPartialInjectionFailure1() {
+ void testPartialInjectionFailure1() {
when(resourceResolver.getResource("/some/other/path")).thenReturn(null);
ResourcePathPartialModel model = factory.getAdapter(adaptableResource,
ResourcePathPartialModel.class);
@@ -183,7 +183,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void testPartialInjectionFailure2() {
+ void testPartialInjectionFailure2() {
lenient().when(resourceResolver.getResource("/some/other/path")).thenReturn(null);
lenient().when(resourceResolver.getResource("/some/other/path2")).thenReturn(null);
@@ -192,7 +192,7 @@ public class ResourcePathInjectionTest {
}
@Test
- public void TestWithArrayWrapping() {
+ void TestWithArrayWrapping() {
ResourcePathModelWrapping model =
factory.getAdapter(adaptableResource, ResourcePathModelWrapping.class);
assertNotNull(model);
assertTrue(model.getFromPath().length > 0);
