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 4698a26 SLING-13115 - [Sling Models] Migrate ServiceAdapters,
StaticFieldInjection, and Via Tests to JUnit 5 (#83)
4698a26 is described below
commit 4698a26d1fedab61f09e9d41eded5c651cf986b9
Author: Bhavik Kothari <[email protected]>
AuthorDate: Mon Feb 16 13:55:28 2026 +0530
SLING-13115 - [Sling Models] Migrate ServiceAdapters, StaticFieldInjection,
and Via Tests to JUnit 5 (#83)
---
.../sling/models/impl/SelfDependencyTest.java | 28 +++++++++---------
.../impl/StaticInjectionAPFLoadOrderTest.java | 33 +++++++++++-----------
.../java/org/apache/sling/models/impl/ViaTest.java | 29 ++++++++++---------
3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/test/java/org/apache/sling/models/impl/SelfDependencyTest.java
b/src/test/java/org/apache/sling/models/impl/SelfDependencyTest.java
index f709827..9099a2d 100644
--- a/src/test/java/org/apache/sling/models/impl/SelfDependencyTest.java
+++ b/src/test/java/org/apache/sling/models/impl/SelfDependencyTest.java
@@ -27,22 +27,22 @@ import
org.apache.sling.models.testmodels.classes.IndirectCyclicSelfDependencyMo
import
org.apache.sling.models.testmodels.classes.IndirectCyclicSelfDependencyModelB;
import org.apache.sling.models.testmodels.classes.SelfDependencyModelA;
import org.apache.sling.models.testmodels.classes.SelfDependencyModelB;
-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.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+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.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
-@RunWith(MockitoJUnitRunner.class)
-public class SelfDependencyTest {
+@ExtendWith(MockitoExtension.class)
+class SelfDependencyTest {
private ModelAdapterFactory factory;
@@ -50,8 +50,8 @@ public class SelfDependencyTest {
private SlingJakartaHttpServletRequest request;
@SuppressWarnings("unchecked")
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
lenient().when(request.adaptTo(any(Class.class))).then(new
Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable
{
@@ -71,7 +71,7 @@ public class SelfDependencyTest {
}
@Test
- public void testChainedSelfDependency() {
+ void testChainedSelfDependency() {
SelfDependencyModelA objectA = factory.getAdapter(request,
SelfDependencyModelA.class);
assertNotNull(objectA);
SelfDependencyModelB objectB = objectA.getDependencyB();
@@ -80,13 +80,13 @@ public class SelfDependencyTest {
}
@Test
- public void testDirectCyclicSelfDependency() {
+ void testDirectCyclicSelfDependency() {
DirectCyclicSelfDependencyModel object = factory.getAdapter(request,
DirectCyclicSelfDependencyModel.class);
assertNull(object);
}
@Test
- public void testInddirectCyclicSelfDependency() {
+ void testInddirectCyclicSelfDependency() {
IndirectCyclicSelfDependencyModelA object =
factory.getAdapter(request,
IndirectCyclicSelfDependencyModelA.class);
assertNull(object);
diff --git
a/src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java
b/src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java
index 85d95bc..2f871b5 100644
---
a/src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java
@@ -28,25 +28,24 @@ import
org.apache.sling.models.impl.injectors.SlingObjectInjector;
import org.apache.sling.models.testutil.ModelAdapterFactoryUtil;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.sling.testing.mock.osgi.junit5.OsgiContextExtension;
+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.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
/**
* Test load order behavior of StaticInjectionAnnotationProcesssorFactory
instances (SLING-5010).
*/
-@RunWith(MockitoJUnitRunner.class)
-public class StaticInjectionAPFLoadOrderTest {
+@ExtendWith({OsgiContextExtension.class, MockitoExtension.class})
+class StaticInjectionAPFLoadOrderTest {
- @Rule
- public OsgiContext context = new OsgiContext();
+ final OsgiContext context = new OsgiContext();
@Mock
private SlingJakartaHttpServletRequest request;
@@ -62,8 +61,8 @@ public class StaticInjectionAPFLoadOrderTest {
private ModelAdapterFactory factory;
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
registerServices();
}
@@ -71,7 +70,7 @@ public class StaticInjectionAPFLoadOrderTest {
* Registration order: 1. ModelFactory, 2. custom injector, 3. model
*/
@Test
- public void testFactory_Injector_Model() {
+ void testFactory_Injector_Model() {
when(request.getResourceResolver()).thenReturn(null);
registerCustomInjector();
@@ -85,7 +84,7 @@ public class StaticInjectionAPFLoadOrderTest {
* Registration order: 1. ModelFactory, 2. custom injector, 3. model
*/
@Test
- public void testFactory_Injector_Model_WithResourceResolver() {
+ void testFactory_Injector_Model_WithResourceResolver() {
when(request.getResourceResolver()).thenReturn(resourceResolver);
registerCustomInjector();
@@ -98,7 +97,7 @@ public class StaticInjectionAPFLoadOrderTest {
* Registration order: 1. ModelFactory, 2. model, 3. custom injector
*/
@Test
- public void testFactory_Model_Injector() {
+ void testFactory_Model_Injector() {
when(request.getResourceResolver()).thenReturn(null);
registerModel();
@@ -112,7 +111,7 @@ public class StaticInjectionAPFLoadOrderTest {
* Registration order: 1. ModelFactory, 2. model, 3. custom injector
*/
@Test
- public void testFactory_Model_Injector_WithResourceResolver() {
+ void testFactory_Model_Injector_WithResourceResolver() {
when(request.getResourceResolver()).thenReturn(resourceResolver);
registerModel();
diff --git a/src/test/java/org/apache/sling/models/impl/ViaTest.java
b/src/test/java/org/apache/sling/models/impl/ViaTest.java
index 7de1b3a..1f48871 100644
--- a/src/test/java/org/apache/sling/models/impl/ViaTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ViaTest.java
@@ -30,18 +30,19 @@ import
org.apache.sling.models.impl.via.BeanPropertyViaProvider;
import org.apache.sling.models.impl.via.ChildResourceViaProvider;
import org.apache.sling.models.testmodels.classes.ChildResourceViaModel;
import org.apache.sling.models.testmodels.classes.ViaModel;
-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.lenient;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
-public class ViaTest {
+@ExtendWith(MockitoExtension.class)
+class ViaTest {
@Mock
private Resource resource;
@@ -54,10 +55,10 @@ public class ViaTest {
private ModelAdapterFactory factory;
- @Before
- public void setup() {
- when(request.getResource()).thenReturn(resource);
- when(resource.getChild("jcr:content")).thenReturn(childResource);
+ @BeforeEach
+ void setup() {
+ lenient().when(request.getResource()).thenReturn(resource);
+
lenient().when(resource.getChild("jcr:content")).thenReturn(childResource);
factory = AdapterFactoryTest.createModelAdapterFactory();
factory.injectors = Collections.singletonList(new ValueMapInjector());
factory.bindViaProvider(new BeanPropertyViaProvider(), null);
@@ -67,7 +68,7 @@ public class ViaTest {
}
@Test
- public void testProjectionToResource() {
+ void testProjectionToResource() {
String value = RandomStringUtils.secure().nextAlphanumeric(10);
ValueMap map = new ValueMapDecorator(Collections.<String,
Object>singletonMap("firstProperty", value));
when(resource.adaptTo(ValueMap.class)).thenReturn(map);
@@ -78,7 +79,7 @@ public class ViaTest {
}
@Test
- public void testProjectionToChildResource() {
+ void testProjectionToChildResource() {
String value = RandomStringUtils.secure().nextAlphanumeric(10);
ValueMap map = new ValueMapDecorator(Collections.<String,
Object>singletonMap("firstProperty", value));
when(childResource.adaptTo(ValueMap.class)).thenReturn(map);
