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 eae0b8c SLING-13062 - [Sling Models] Migrate basic injectors tests to
JUnit 5 (#70)
eae0b8c is described below
commit eae0b8ccb957ed95e20041863d7c98d7699c2653
Author: Bhavik Kothari <[email protected]>
AuthorDate: Tue Jan 20 19:14:40 2026 +0530
SLING-13062 - [Sling Models] Migrate basic injectors tests to JUnit 5 (#70)
SLING-13062 - [Sling Models] import clean up
Co-authored-by: Bhavik Kothari <[email protected]>
---
.../impl/injectors/BindingsInjectorTest.java | 42 ++++++++++---------
.../injectors/RequestAttributeInjectorTest.java | 37 +++++++++--------
.../impl/injectors/ResourcePathInjectorTest.java | 32 +++++++--------
.../impl/injectors/ValueMapInjectorTest.java | 48 +++++++++++-----------
4 files changed, 83 insertions(+), 76 deletions(-)
diff --git
a/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
b/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
index f20d5a0..431662a 100644
---
a/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
+++
b/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
@@ -25,17 +25,21 @@ import java.lang.reflect.AnnotatedElement;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.models.spi.DisposalCallbackRegistry;
-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.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class BindingsInjectorTest {
+@ExtendWith(MockitoExtension.class)
+class BindingsInjectorTest {
private BindingsInjector injector = new BindingsInjector();
@@ -58,40 +62,40 @@ public class BindingsInjectorTest {
private static final int INTEGER_VALUE = 42;
private static final ResourceResolver CLASS_INSTANCE =
mock(ResourceResolver.class);
- @Before
- public void setUp() {
-
when(request.getAttribute(SlingBindings.class.getName())).thenReturn(bindings);
- when(bindings.get(STRING_PARAM)).thenReturn(STRING_VALUE);
- when(bindings.get(INTEGER_PARAM)).thenReturn(INTEGER_VALUE);
- when(bindings.get(CLASS_PARAM)).thenReturn(CLASS_INSTANCE);
+ @BeforeEach
+ void setUp() {
+
lenient().when(request.getAttribute(SlingBindings.class.getName())).thenReturn(bindings);
+ lenient().when(bindings.get(STRING_PARAM)).thenReturn(STRING_VALUE);
+ lenient().when(bindings.get(INTEGER_PARAM)).thenReturn(INTEGER_VALUE);
+ lenient().when(bindings.get(CLASS_PARAM)).thenReturn(CLASS_INSTANCE);
}
@Test
- public void testStringParam() {
+ void testStringParam() {
Object result = injector.getValue(request, STRING_PARAM, String.class,
element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
- public void testIntegerParam() {
+ void testIntegerParam() {
Object result = injector.getValue(request, INTEGER_PARAM,
Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
- public void testClassInstance() {
+ void testClassInstance() {
Object result = injector.getValue(request, CLASS_PARAM,
ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
- public void testNonRequestAdaptable() {
+ void testNonRequestAdaptable() {
Object result = injector.getValue(mock(ResourceResolver.class),
STRING_PARAM, String.class, element, registry);
assertNull(result);
}
@Test
- public void testRequestThatDoesNotContainBindings() {
+ void testRequestThatDoesNotContainBindings() {
when(request.getAttribute(SlingBindings.class.getName())).thenReturn(null);
Object result = injector.getValue(request, STRING_PARAM, String.class,
element, registry);
assertNull(result);
diff --git
a/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
b/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
index 1683e80..7c1df18 100644
---
a/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
+++
b/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
@@ -24,17 +24,20 @@ import java.lang.reflect.AnnotatedElement;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.models.spi.DisposalCallbackRegistry;
-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.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
-public class RequestAttributeInjectorTest {
+@ExtendWith(MockitoExtension.class)
+class RequestAttributeInjectorTest {
private RequestAttributeInjector injector = new RequestAttributeInjector();
@@ -54,33 +57,33 @@ public class RequestAttributeInjectorTest {
private static final int INTEGER_VALUE = 42;
private static final ResourceResolver CLASS_INSTANCE =
mock(ResourceResolver.class);
- @Before
- public void setUp() {
- when(request.getAttribute(STRING_PARAM)).thenReturn(STRING_VALUE);
- when(request.getAttribute(INTEGER_PARAM)).thenReturn(INTEGER_VALUE);
- when(request.getAttribute(CLASS_PARAM)).thenReturn(CLASS_INSTANCE);
+ @BeforeEach
+ void setUp() {
+
lenient().when(request.getAttribute(STRING_PARAM)).thenReturn(STRING_VALUE);
+
lenient().when(request.getAttribute(INTEGER_PARAM)).thenReturn(INTEGER_VALUE);
+
lenient().when(request.getAttribute(CLASS_PARAM)).thenReturn(CLASS_INSTANCE);
}
@Test
- public void testStringParam() {
+ void testStringParam() {
Object result = injector.getValue(request, STRING_PARAM, String.class,
element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
- public void testIntegerParam() {
+ void testIntegerParam() {
Object result = injector.getValue(request, INTEGER_PARAM,
Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
- public void testClassInstance() {
+ void testClassInstance() {
Object result = injector.getValue(request, CLASS_PARAM,
ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
- public void testNonRequestAdaptable() {
+ void testNonRequestAdaptable() {
Object result = injector.getValue(mock(ResourceResolver.class),
STRING_PARAM, String.class, element, registry);
assertNull(result);
}
diff --git
a/src/test/java/org/apache/sling/models/impl/injectors/ResourcePathInjectorTest.java
b/src/test/java/org/apache/sling/models/impl/injectors/ResourcePathInjectorTest.java
index 52f323f..91664d4 100644
---
a/src/test/java/org/apache/sling/models/impl/injectors/ResourcePathInjectorTest.java
+++
b/src/test/java/org/apache/sling/models/impl/injectors/ResourcePathInjectorTest.java
@@ -26,19 +26,19 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.wrappers.JakartaToJavaxRequestWrapper;
import org.apache.sling.models.annotations.injectorspecific.ResourcePath;
import org.apache.sling.models.spi.DisposalCallbackRegistry;
-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.Mockito;
-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.Mockito.lenient;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ResourcePathInjectorTest {
+@ExtendWith(MockitoExtension.class)
+class ResourcePathInjectorTest {
private ResourcePathInjector injector = new ResourcePathInjector();
@@ -54,19 +54,19 @@ public class ResourcePathInjectorTest {
@Mock
private SlingJakartaHttpServletRequest jakartaRequest;
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
ResourcePath mockResourcePath = Mockito.mock(ResourcePath.class);
- when(mockResourcePath.path()).thenReturn("/resource1");
-
when(element.getAnnotation(ResourcePath.class)).thenReturn(mockResourcePath);
+ lenient().when(mockResourcePath.path()).thenReturn("/resource1");
+
lenient().when(element.getAnnotation(ResourcePath.class)).thenReturn(mockResourcePath);
ResourceResolver mockRR = mock(ResourceResolver.class);
- when(mockRR.getResource("/resource1")).thenReturn(resource);
- when(jakartaRequest.getResourceResolver()).thenReturn(mockRR);
+ lenient().when(mockRR.getResource("/resource1")).thenReturn(resource);
+
lenient().when(jakartaRequest.getResourceResolver()).thenReturn(mockRR);
}
@Test
- public void testResourcePathFromJakartaRequest() {
+ void testResourcePathFromJakartaRequest() {
Object result = this.injector.getValue(this.jakartaRequest, null,
Resource.class, element, registry);
assertEquals(result, this.resource);
}
@@ -76,7 +76,7 @@ public class ResourcePathInjectorTest {
*/
@Deprecated(since = "2.0.0")
@Test
- public void testResourcePathFromJavaxRequest() {
+ void testResourcePathFromJavaxRequest() {
org.apache.sling.api.SlingHttpServletRequest javaxRequest =
JakartaToJavaxRequestWrapper.toJavaxRequest(this.jakartaRequest);
Object result = this.injector.getValue(javaxRequest, null,
Resource.class, element, registry);
diff --git
a/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
b/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
index b3fa02c..4534e36 100644
---
a/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
+++
b/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
@@ -26,20 +26,20 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.JakartaToJavaxRequestWrapper;
import org.apache.sling.models.spi.DisposalCallbackRegistry;
-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.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ValueMapInjectorTest {
+@ExtendWith(MockitoExtension.class)
+class ValueMapInjectorTest {
private ValueMapInjector injector = new ValueMapInjector();
@@ -65,48 +65,48 @@ public class ValueMapInjectorTest {
private static final int INTEGER_VALUE = 42;
private static final ResourceResolver CLASS_INSTANCE =
mock(ResourceResolver.class);
- @Before
- public void setUp() {
- when(valueMap.get(STRING_PARAM,
String.class)).thenReturn(STRING_VALUE);
- when(valueMap.get(INTEGER_PARAM,
Integer.class)).thenReturn(INTEGER_VALUE);
- when(valueMap.get(CLASS_PARAM,
ResourceResolver.class)).thenReturn(CLASS_INSTANCE);
+ @BeforeEach
+ void setUp() {
+ lenient().when(valueMap.get(STRING_PARAM,
String.class)).thenReturn(STRING_VALUE);
+ lenient().when(valueMap.get(INTEGER_PARAM,
Integer.class)).thenReturn(INTEGER_VALUE);
+ lenient().when(valueMap.get(CLASS_PARAM,
ResourceResolver.class)).thenReturn(CLASS_INSTANCE);
- when(this.resource.adaptTo(ValueMap.class)).thenReturn(valueMap);
- when(this.jakartaRequest.getResource()).thenReturn(this.resource);
+
lenient().when(this.resource.adaptTo(ValueMap.class)).thenReturn(valueMap);
+
lenient().when(this.jakartaRequest.getResource()).thenReturn(this.resource);
}
@Test
- public void testStringParam() {
+ void testStringParam() {
Object result = injector.getValue(valueMap, STRING_PARAM,
String.class, element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
- public void testIntegerParam() {
+ void testIntegerParam() {
Object result = injector.getValue(valueMap, INTEGER_PARAM,
Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
- public void testClassInstance() {
+ void testClassInstance() {
Object result = injector.getValue(valueMap, CLASS_PARAM,
ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
- public void testNonMatchingClassInstance() {
+ void testNonMatchingClassInstance() {
Object result = injector.getValue(valueMap, CLASS_PARAM,
Resource.class, element, registry);
assertNull(result);
}
@Test
- public void testNonValueMapAdaptable() {
+ void testNonValueMapAdaptable() {
Object result = injector.getValue(mock(ResourceResolver.class),
STRING_PARAM, String.class, element, registry);
assertNull(result);
}
@Test
- public void testStringParamFromJakartaRequest() {
+ void testStringParamFromJakartaRequest() {
Object result = this.injector.getValue(this.jakartaRequest,
STRING_PARAM, String.class, element, registry);
assertEquals(STRING_VALUE, result);
}
@@ -116,7 +116,7 @@ public class ValueMapInjectorTest {
*/
@Deprecated(since = "2.0.0")
@Test
- public void testStringParamFromJavaxRequest() {
+ void testStringParamFromJavaxRequest() {
org.apache.sling.api.SlingHttpServletRequest javaxRequest =
JakartaToJavaxRequestWrapper.toJavaxRequest(this.jakartaRequest);
Object result = this.injector.getValue(javaxRequest, STRING_PARAM,
String.class, element, registry);
