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 ce484b7 SLING-13064: [Sling Models] Migrate 'via' package unit tests
to JUnit 5 (#72)
ce484b7 is described below
commit ce484b73631bf5fba5c7ab55d59aef11b8b217fd
Author: Bhavik Kothari <[email protected]>
AuthorDate: Thu Jan 22 15:38:36 2026 +0530
SLING-13064: [Sling Models] Migrate 'via' package unit tests to JUnit 5
(#72)
Co-authored-by: Bhavik Kothari <[email protected]>
---
.../via/AbstractResourceTypeViaProviderTest.java | 36 ++++++--------
.../impl/via/BeanPropertyViaProviderTest.java | 20 ++++----
.../impl/via/ChildResourceViaProviderTest.java | 55 +++++++++++-----------
.../via/ForcedResourceTypeViaProviderTest.java | 23 +++++----
.../via/OriginalResourceTypeViaProviderTest.java | 34 ++++++-------
.../impl/via/ResourceSuperTypeViaProviderTest.java | 22 ++++-----
...sourceTypeForcingJakartaRequestWrapperTest.java | 18 +++----
.../via/ResourceTypeForcingRequestWrapperTest.java | 18 +++----
8 files changed, 108 insertions(+), 118 deletions(-)
diff --git
a/src/test/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProviderTest.java
index 249e74e..268e793 100644
---
a/src/test/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProviderTest.java
@@ -18,26 +18,24 @@
*/
package org.apache.sling.models.impl.via;
+import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.ViaProviderType;
import org.apache.sling.models.spi.ViaProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- *
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AbstractResourceTypeViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class AbstractResourceTypeViaProviderTest {
private AbstractResourceTypeViaProvider provider = new
AbstractResourceTypeViaProvider() {
@Override
public Class<? extends ViaProviderType> getType() {
@@ -59,13 +57,12 @@ public class AbstractResourceTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.AbstractResourceTypeViaProvider#getAdaptable(java.lang.Object,
java.lang.String)}.
*/
@Test
- public void testGetAdaptableWhenNotHandled() {
+ void testGetAdaptableWhenNotHandled() {
assertEquals(ViaProvider.ORIGINAL, provider.getAdaptable("hello",
"nothandled"));
}
@Test
- public void testGetAdaptableForResource() {
- Resource mockResource = Mockito.mock(Resource.class);
+ void testGetAdaptableForResource(@Mock Resource mockResource) {
Object adaptable = provider.getAdaptable(mockResource, "handled");
assertTrue(adaptable instanceof ResourceTypeForcingResourceWrapper);
@@ -73,8 +70,7 @@ public class AbstractResourceTypeViaProviderTest {
}
@Test
- public void testGetAdaptableForJakartaRequest() {
- SlingJakartaHttpServletRequest mockJakartaRequest =
Mockito.mock(SlingJakartaHttpServletRequest.class);
+ void testGetAdaptableForJakartaRequest(@Mock
SlingJakartaHttpServletRequest mockJakartaRequest) {
Object adaptable = provider.getAdaptable(mockJakartaRequest,
"handled");
assertTrue(adaptable instanceof
ResourceTypeForcingJakartaRequestWrapper);
@@ -86,9 +82,7 @@ public class AbstractResourceTypeViaProviderTest {
*/
@Deprecated(since = "2.0.0")
@Test
- public void testGetAdaptableForJavaxRequest() {
- org.apache.sling.api.SlingHttpServletRequest mockJavaxRequest =
-
Mockito.mock(org.apache.sling.api.SlingHttpServletRequest.class);
+ void testGetAdaptableForJavaxRequest(@Mock SlingHttpServletRequest
mockJavaxRequest) {
Object adaptable = provider.getAdaptable(mockJavaxRequest, "handled");
assertTrue(adaptable instanceof ResourceTypeForcingRequestWrapper);
@@ -96,7 +90,7 @@ public class AbstractResourceTypeViaProviderTest {
}
@Test
- public void testGetAdaptableForOther() {
+ void testGetAdaptableForOther() {
assertNull(provider.getAdaptable(new Object(), "nullResourceType"));
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/via/BeanPropertyViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/BeanPropertyViaProviderTest.java
index fa02f2d..51c9579 100644
---
a/src/test/java/org/apache/sling/models/impl/via/BeanPropertyViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/BeanPropertyViaProviderTest.java
@@ -20,17 +20,15 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.models.annotations.via.BeanProperty;
import org.apache.sling.models.spi.ViaProvider;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-/**
- *
- */
-@RunWith(MockitoJUnitRunner.class)
-public class BeanPropertyViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class BeanPropertyViaProviderTest {
private BeanPropertyViaProvider provider = new BeanPropertyViaProvider();
@@ -38,7 +36,7 @@ public class BeanPropertyViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.BeanPropertyViaProvider#getType()}.
*/
@Test
- public void testGetType() {
+ void testGetType() {
assertEquals(BeanProperty.class, provider.getType());
}
@@ -46,7 +44,7 @@ public class BeanPropertyViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.BeanPropertyViaProvider#getAdaptable(java.lang.Object,
java.lang.String)}.
*/
@Test
- public void testGetAdaptable() {
+ void testGetAdaptable() {
// not handled
assertEquals(ViaProvider.ORIGINAL, provider.getAdaptable(new Object(),
""));
diff --git
a/src/test/java/org/apache/sling/models/impl/via/ChildResourceViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/ChildResourceViaProviderTest.java
index 5eda18a..3d1b006 100644
---
a/src/test/java/org/apache/sling/models/impl/via/ChildResourceViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/ChildResourceViaProviderTest.java
@@ -21,17 +21,18 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.spi.ViaProvider;
-import org.junit.Assert;
-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.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.lenient;
-@RunWith(MockitoJUnitRunner.class)
-public class ChildResourceViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class ChildResourceViaProviderTest {
private ChildResourceViaProvider provider = new ChildResourceViaProvider();
@@ -53,40 +54,40 @@ public class ChildResourceViaProviderTest {
private org.apache.sling.api.SlingHttpServletRequest javaxRequest;
@SuppressWarnings("deprecation")
- @Before
- public void init() {
- when(resource.getChild("child")).thenReturn(childResource);
- when(jakartaRequest.getResource()).thenReturn(resource);
- when(javaxRequest.getResource()).thenReturn(resource);
+ @BeforeEach
+ void init() {
+ lenient().when(resource.getChild("child")).thenReturn(childResource);
+ lenient().when(jakartaRequest.getResource()).thenReturn(resource);
+ lenient().when(javaxRequest.getResource()).thenReturn(resource);
}
@Test
- public void testResource() {
+ void testResource() {
Object adaptable = provider.getAdaptable(resource, "child");
- Assert.assertEquals(adaptable, childResource);
+ assertEquals(adaptable, childResource);
}
@Test
- public void testResourceWithBlank() {
+ void testResourceWithBlank() {
Object adaptable = provider.getAdaptable(resource, "");
- Assert.assertEquals(ViaProvider.ORIGINAL, adaptable);
+ assertEquals(ViaProvider.ORIGINAL, adaptable);
}
@Test
- public void testResourceWithOtherAdaptable() {
- Assert.assertNull(provider.getAdaptable(new Object(), "child"));
+ void testResourceWithOtherAdaptable() {
+ assertNull(provider.getAdaptable(new Object(), "child"));
}
@Test
- public void testJakartaRequest() {
+ void testJakartaRequest() {
Object adaptable = provider.getAdaptable(jakartaRequest, "child");
Resource adaptableResource = ((SlingJakartaHttpServletRequest)
adaptable).getResource();
- Assert.assertEquals(adaptableResource, childResource);
+ assertEquals(adaptableResource, childResource);
}
@Test
- public void testJakartaRequestWhenChildDoesNotExist() {
- Assert.assertNull(provider.getAdaptable(jakartaRequest,
"notexisting"));
+ void testJakartaRequestWhenChildDoesNotExist() {
+ assertNull(provider.getAdaptable(jakartaRequest, "notexisting"));
}
/**
@@ -94,10 +95,10 @@ public class ChildResourceViaProviderTest {
*/
@Deprecated
@Test
- public void testJavaxRequest() {
+ void testJavaxRequest() {
Object adaptable = provider.getAdaptable(javaxRequest, "child");
Resource adaptableResource =
((org.apache.sling.api.SlingHttpServletRequest) adaptable).getResource();
- Assert.assertEquals(adaptableResource, childResource);
+ assertEquals(adaptableResource, childResource);
}
/**
@@ -105,7 +106,7 @@ public class ChildResourceViaProviderTest {
*/
@Deprecated
@Test
- public void testJavaxRequestWhenChildDoesNotExist() {
- Assert.assertNull(provider.getAdaptable(javaxRequest, "notexisting"));
+ void testJavaxRequestWhenChildDoesNotExist() {
+ assertNull(provider.getAdaptable(javaxRequest, "notexisting"));
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/via/ForcedResourceTypeViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/ForcedResourceTypeViaProviderTest.java
index 2d089f2..f6994d9 100644
---
a/src/test/java/org/apache/sling/models/impl/via/ForcedResourceTypeViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/ForcedResourceTypeViaProviderTest.java
@@ -20,18 +20,17 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.via.ForcedResourceType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- *
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ForcedResourceTypeViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class ForcedResourceTypeViaProviderTest {
private ForcedResourceTypeViaProvider provider = new
ForcedResourceTypeViaProvider();
@@ -42,7 +41,7 @@ public class ForcedResourceTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ForcedResourceTypeViaProvider#handle(java.lang.String)}.
*/
@Test
- public void testHandle() {
+ void testHandle() {
assertTrue(provider.handle("foo"));
assertFalse(provider.handle(""));
}
@@ -51,7 +50,7 @@ public class ForcedResourceTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ForcedResourceTypeViaProvider#getResourceType(org.apache.sling.api.resource.Resource,
java.lang.String)}.
*/
@Test
- public void testGetResourceType() {
+ void testGetResourceType() {
assertEquals("foo", provider.getResourceType(resource, "foo"));
}
@@ -59,7 +58,7 @@ public class ForcedResourceTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ForcedResourceTypeViaProvider#getType()}.
*/
@Test
- public void testGetType() {
+ void testGetType() {
assertEquals(ForcedResourceType.class, provider.getType());
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
index 0dc8d59..3a59006 100644
---
a/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
@@ -24,16 +24,16 @@ import org.apache.sling.api.resource.ResourceWrapper;
import org.apache.sling.api.wrappers.JakartaToJavaxRequestWrapper;
import org.apache.sling.api.wrappers.SlingJakartaHttpServletRequestWrapper;
import org.apache.sling.models.annotations.via.OriginalResourceType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-@RunWith(MockitoJUnitRunner.class)
-public class OriginalResourceTypeViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class OriginalResourceTypeViaProviderTest {
private OriginalResourceTypeViaProvider provider = new
OriginalResourceTypeViaProvider();
@@ -44,30 +44,30 @@ public class OriginalResourceTypeViaProviderTest {
private SlingJakartaHttpServletRequest request;
@Test
- public void testReturnsCorrectMarkerInterface() {
+ void testReturnsCorrectMarkerInterface() {
assertEquals(OriginalResourceType.class, provider.getType());
}
@Test
- public void testReturnsOriginalResourceIfNotWrapped() {
+ void testReturnsOriginalResourceIfNotWrapped() {
Object projected = provider.getAdaptable(resource, null);
assertEquals(resource, projected);
}
@Test
- public void testReturnsOriginalRequestIfNotWrapped() {
+ void testReturnsOriginalRequestIfNotWrapped() {
Object projected = provider.getAdaptable(request, null);
assertEquals(request, projected);
}
@Test
- public void testReturnsNullIfNeitherRequestOrResource() {
+ void testReturnsNullIfNeitherRequestOrResource() {
Object projected = provider.getAdaptable(new Object(), null);
assertNull(projected);
}
@Test
- public void testUnwrapsResource() {
+ void testUnwrapsResource() {
// once
Resource testCase = new ResourceTypeForcingResourceWrapper(resource,
"foo");
Object projected = provider.getAdaptable(testCase, null);
@@ -81,7 +81,7 @@ public class OriginalResourceTypeViaProviderTest {
}
@Test
- public void testUnwrapsJakartaRequest() {
+ void testUnwrapsJakartaRequest() {
// once
SlingJakartaHttpServletRequest testCase =
new ResourceTypeForcingJakartaRequestWrapper(request,
resource, "foo");
@@ -100,7 +100,7 @@ public class OriginalResourceTypeViaProviderTest {
*/
@Deprecated
@Test
- public void testUnwrapsJavaxRequest() {
+ void testUnwrapsJavaxRequest() {
org.apache.sling.api.SlingHttpServletRequest javaxRequest =
JakartaToJavaxRequestWrapper.toJavaxRequest(request);
// once
@@ -117,14 +117,14 @@ public class OriginalResourceTypeViaProviderTest {
}
@Test
- public void testDoesNotUnwrapOtherResourceWrappers() {
+ void testDoesNotUnwrapOtherResourceWrappers() {
Resource testCase = new ResourceWrapper(resource);
Object projected = provider.getAdaptable(testCase, null);
assertEquals(testCase, projected);
}
@Test
- public void testDoesNotUnwrapOtherJakartaRequestWrappers() {
+ void testDoesNotUnwrapOtherJakartaRequestWrappers() {
SlingJakartaHttpServletRequest testCase = new
SlingJakartaHttpServletRequestWrapper(request);
Object projected = provider.getAdaptable(testCase, null);
assertEquals(testCase, projected);
@@ -135,7 +135,7 @@ public class OriginalResourceTypeViaProviderTest {
*/
@Deprecated
@Test
- public void testDoesNotUnwrapOtherJavaxRequestWrappers() {
+ void testDoesNotUnwrapOtherJavaxRequestWrappers() {
org.apache.sling.api.SlingHttpServletRequest javaxRequest =
JakartaToJavaxRequestWrapper.toJavaxRequest(request);
org.apache.sling.api.SlingHttpServletRequest testCase =
diff --git
a/src/test/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProviderTest.java
b/src/test/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProviderTest.java
index 8eab1bf..76b1e99 100644
---
a/src/test/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProviderTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProviderTest.java
@@ -21,19 +21,17 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.models.annotations.via.ResourceSuperType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- *
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceSuperTypeViaProviderTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceSuperTypeViaProviderTest {
private ResourceSuperTypeViaProvider provider = new
ResourceSuperTypeViaProvider();
@@ -47,7 +45,7 @@ public class ResourceSuperTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ResourceSuperTypeViaProvider#handle(java.lang.String)}.
*/
@Test
- public void testHandle() {
+ void testHandle() {
assertTrue(provider.handle("foo"));
}
@@ -55,7 +53,7 @@ public class ResourceSuperTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ResourceSuperTypeViaProvider#getResourceType(org.apache.sling.api.resource.Resource,
java.lang.String)}.
*/
@Test
- public void testGetResourceType() {
+ void testGetResourceType() {
Mockito.when(resourceResolver.getParentResourceType(resource)).thenReturn("test1");
Mockito.when(resource.getResourceResolver()).thenReturn(resourceResolver);
assertEquals("test1", provider.getResourceType(resource, "foo"));
@@ -65,7 +63,7 @@ public class ResourceSuperTypeViaProviderTest {
* Test method for {@link
org.apache.sling.models.impl.via.ResourceSuperTypeViaProvider#getType()}.
*/
@Test
- public void testGetType() {
+ void testGetType() {
assertEquals(ResourceSuperType.class, provider.getType());
}
}
diff --git
a/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingJakartaRequestWrapperTest.java
b/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingJakartaRequestWrapperTest.java
index 0dd077d..35215ae 100644
---
a/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingJakartaRequestWrapperTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingJakartaRequestWrapperTest.java
@@ -20,20 +20,20 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceTypeForcingJakartaRequestWrapperTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceTypeForcingJakartaRequestWrapperTest {
@Mock
private Resource resource;
@@ -45,7 +45,7 @@ public class ResourceTypeForcingJakartaRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.via.ResourceTypeForcingJakartaRequestWrapper#getResource()}.
*/
@Test
- public void testGetResource() {
+ void testGetResource() {
// once
ResourceTypeForcingJakartaRequestWrapper testCase =
new ResourceTypeForcingJakartaRequestWrapper(request,
resource, "foo");
diff --git
a/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingRequestWrapperTest.java
b/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingRequestWrapperTest.java
index 4bb5ade..9dbbb0c 100644
---
a/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingRequestWrapperTest.java
+++
b/src/test/java/org/apache/sling/models/impl/via/ResourceTypeForcingRequestWrapperTest.java
@@ -20,14 +20,14 @@ package org.apache.sling.models.impl.via;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -36,8 +36,8 @@ import static org.junit.Assert.assertTrue;
* @deprecated use {@link ResourceTypeForcingJakartaRequestWrapperTest)}
instead
*/
@Deprecated(since = "2.0.0")
-@RunWith(MockitoJUnitRunner.class)
-public class ResourceTypeForcingRequestWrapperTest {
+@ExtendWith(MockitoExtension.class)
+class ResourceTypeForcingRequestWrapperTest {
@Mock
private Resource resource;
@@ -49,7 +49,7 @@ public class ResourceTypeForcingRequestWrapperTest {
* Test method for {@link
org.apache.sling.models.impl.via.ResourceTypeForcingRequestWrapper#getResource()}.
*/
@Test
- public void testGetResource() {
+ void testGetResource() {
// once
ResourceTypeForcingRequestWrapper testCase = new
ResourceTypeForcingRequestWrapper(request, resource, "foo");
Resource wrappedResource = testCase.getResource();
