You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by jo...@apache.org on 2023/09/09 16:35:34 UTC
[sling-org-apache-sling-resourceresolver] 01/01: SLING-12021 upate to parent 52, support build with java 17
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch SLING-12021-update-paren-52
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit e8e9711cf676a636616420080782807c1479de4e
Author: Jörg Hoh <jo...@joerghoh.de>
AuthorDate: Sat Sep 9 18:35:19 2023 +0200
SLING-12021 upate to parent 52, support build with java 17
---
pom.xml | 6 +++---
.../resourceresolver/impl/EtcMappingResourceResolverTest.java | 4 ++--
.../resourceresolver/impl/MockedResourceResolverImplTest.java | 4 ++--
.../sling/resourceresolver/impl/ResourceResolverImplTest.java | 11 +++++++++--
.../impl/helper/ResourceResolverControlTest.java | 10 +++++-----
.../impl/mapping/AbstractMappingMapEntriesTest.java | 8 ++++----
.../impl/mapping/EtcMappingMapEntriesTest.java | 4 ++--
.../sling/resourceresolver/impl/mapping/MapEntriesTest.java | 11 ++++++-----
.../stateful/SecureResourceProviderDecoratorTest.java | 2 +-
9 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index d1c7acf..75d9d34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>49</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -212,8 +212,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-core</artifactId>
+ <version>5.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
index 5193b62..891a2fa 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
@@ -57,8 +57,8 @@ import static org.apache.sling.resourceresolver.util.MockTestUtil.createRequestF
import static org.apache.sling.resourceresolver.util.MockTestUtil.createStringInterpolationProviderConfiguration;
import static org.apache.sling.resourceresolver.util.MockTestUtil.setInaccessibleField;
import static org.apache.sling.resourceresolver.util.MockTestUtil.setupStringInterpolationProvider;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
index 7b21023..448651e 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
index 2d9bd75..2791776 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
@@ -66,7 +66,6 @@ import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.Whitebox;
import org.osgi.framework.Bundle;
public class ResourceResolverImplTest {
@@ -241,7 +240,7 @@ public class ResourceResolverImplTest {
ResourceResolverFactoryConfig config = mock(ResourceResolverFactoryConfig.class);
when(config.resource_resolver_log_closing()).thenReturn(true);
ResourceResolverFactoryActivator rrfa = spy(new ResourceResolverFactoryActivator());
- Whitebox.setInternalState(rrfa, "config", config);
+ setField(rrfa, "config", config);
CommonResourceResolverFactoryImpl crrfi = new CommonResourceResolverFactoryImpl(rrfa);
final ResourceResolver rr = new ResourceResolverImpl(crrfi, false, null, resourceProviderTracker);
assertTrue(rr.isLive());
@@ -824,4 +823,12 @@ public class ResourceResolverImplTest {
}
+ public static void setField(Object o, String name, Object value) throws Exception {
+ Field f = o.getClass().getDeclaredField(name);
+ f.setAccessible(true);
+ f.set(o, value);
+ }
+
+
+
}
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
index c99aa54..5a5ef94 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
@@ -157,9 +157,9 @@ public class ResourceResolverControlTest {
somePathRootResource = configureResourceAt(rootProvider, "/some/path");
// configure query at '/'
- when(rootProvider.listChildren((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq(root))).thenReturn(Arrays.asList(somethingResource, someRootResource).iterator());
- when(rootProvider.listChildren((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq(someRootResource))).thenReturn(Arrays.asList(somePathRootResource).iterator());
- when(rootProvider.getResource((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq("/some/path"), Mockito.anyObject(), Mockito.anyObject())).thenReturn(somePathResource);
+ when(rootProvider.listChildren((ResolveContext<Object>) Mockito.any(), Mockito.eq(root))).thenReturn(Arrays.asList(somethingResource, someRootResource).iterator());
+ when(rootProvider.listChildren((ResolveContext<Object>) Mockito.any(), Mockito.eq(someRootResource))).thenReturn(Arrays.asList(somePathRootResource).iterator());
+ when(rootProvider.getResource((ResolveContext<Object>) Mockito.any(), Mockito.eq("/some/path"), Mockito.any(), Mockito.any())).thenReturn(somePathResource);
ResourceResolver rr = mock(ResourceResolver.class);
ResourceAccessSecurityTracker securityTracker = Mockito.mock(ResourceAccessSecurityTracker.class);
@@ -301,11 +301,11 @@ public class ResourceResolverControlTest {
public void getParent_differentProviders() {
final Resource childResource = mock(Resource.class);
when(childResource.getPath()).thenReturn("/some/path");
- when(subProvider.getResource((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq("/some/path"), (ResourceContext) Mockito.anyObject(), (Resource)Mockito.eq(null))).thenReturn(childResource);
+ when(subProvider.getResource((ResolveContext<Object>) Mockito.any(), Mockito.eq("/some/path"), (ResourceContext) Mockito.any(), (Resource)Mockito.eq(null))).thenReturn(childResource);
final Resource parentResource = mock(Resource.class);
when(parentResource.getPath()).thenReturn("/some");
- when(rootProvider.getResource((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq("/some"), (ResourceContext) Mockito.anyObject(), (Resource)Mockito.eq(null))).thenReturn(parentResource);
+ when(rootProvider.getResource((ResolveContext<Object>) Mockito.any(), Mockito.eq("/some"), (ResourceContext) Mockito.any(), (Resource)Mockito.eq(null))).thenReturn(parentResource);
Resource child = crp.getResource(context, "/some/path", null, null, false);
assertNotNull(child);
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
index 6b2bca0..39b0440 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
@@ -50,10 +50,10 @@ import java.util.concurrent.Semaphore;
import static org.apache.sling.resourceresolver.util.MockTestUtil.createStringInterpolationProviderConfiguration;
import static org.apache.sling.resourceresolver.util.MockTestUtil.setupStringInterpolationProvider;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
index a9e390e..f0fb4ec 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
@@ -48,8 +48,8 @@ import static org.apache.sling.resourceresolver.impl.ResourceResolverImpl.PROP_R
import static org.apache.sling.resourceresolver.impl.mapping.MapEntries.PROP_REDIRECT_EXTERNAL;
import static org.apache.sling.resourceresolver.util.MockTestUtil.ExpectedEtcMapping;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
index 6a0b69c..e75df1b 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -68,6 +68,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -443,7 +444,7 @@ public class MapEntriesTest extends AbstractMappingMapEntriesTest {
// map entries should have no alias atm
assertTrue( mapEntries.getResolveMaps().isEmpty());
// till now we already have 2 events being sent
- Mockito.verify(eventAdmin,Mockito.times(2)).postEvent(Mockito.anyObject());
+ Mockito.verify(eventAdmin,Mockito.times(2)).postEvent(ArgumentMatchers.any());
// 3 updates at the same onChange call
mapEntries.onChange(Arrays.asList(
@@ -461,7 +462,7 @@ public class MapEntriesTest extends AbstractMappingMapEntriesTest {
assertTrue(entries.stream().anyMatch(e -> e.getPattern().contains("/target/found3")));
// a single event is sent for all 3 added vanity paths
- Mockito.verify(eventAdmin,Mockito.times(3)).postEvent(Mockito.anyObject());
+ Mockito.verify(eventAdmin,Mockito.times(3)).postEvent(Mockito.any());
}
@Test
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecoratorTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecoratorTest.java
index 8442a71..a342704 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecoratorTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecoratorTest.java
@@ -134,7 +134,7 @@ public class SecureResourceProviderDecoratorTest {
// correct
}
- Mockito.verifyZeroInteractions(rp);
+ Mockito.verifyNoInteractions(rp);
}
@Test