This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch bugfix/java11-build-fix in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git
commit 70e3b506763726cd2ba4e1aafcf70f178ddfa371 Author: Konrad Windszus <[email protected]> AuthorDate: Thu Oct 12 14:11:42 2023 +0200 SLING-12092 Fix build on Java11+ Update parent to 52 Update Mockito --- pom.xml | 41 ++++++++++++------- .../helper/JcrPropertyMapCacheEntryTest.java | 46 +++++++++++----------- .../helper/jcr/BinaryDownloadUriProviderTest.java | 6 +-- .../internal/helper/jcr/ContextUtilTest.java | 3 +- .../JcrResourceProviderSessionHandlingTest.java | 7 ++-- .../helper/jcr/JcrResourceProviderTest.java | 16 +++----- 6 files changed, 62 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index 4897f40..db492a8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>46</version> + <version>52</version> <relativePath /> </parent> @@ -77,18 +77,21 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <!-- JCR --> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> + <scope>provided</scope> </dependency> <!-- OSGi --> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -192,13 +195,14 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <!-- Testing --> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> + <artifactId>mockito-core</artifactId> + <version>5.3.1</version> <scope>test</scope> </dependency> <dependency> @@ -213,32 +217,41 @@ <version>2.6.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>2.12.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> + <version>2.1.10-1.16.0</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> + <artifactId>org.osgi.service.event</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> + <artifactId>org.osgi.service.cm</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>2.12.0</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit-addons</groupId> - <artifactId>junit-addons</artifactId> - <version>1.4</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> - <version>2.1.10-1.16.0</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.tracker</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntryTest.java b/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntryTest.java index 72fd25a..dfebca3 100644 --- a/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntryTest.java +++ b/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntryTest.java @@ -52,7 +52,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; /** @@ -74,56 +73,56 @@ public class JcrPropertyMapCacheEntryTest { public void testByteArray() throws Exception { new JcrPropertyMapCacheEntry(new Byte[0], node); new JcrPropertyMapCacheEntry(new byte[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testShortArray() throws Exception { new JcrPropertyMapCacheEntry(new Short[0], node); new JcrPropertyMapCacheEntry(new short[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testIntArray() throws Exception { new JcrPropertyMapCacheEntry(new Integer[0], node); new JcrPropertyMapCacheEntry(new int[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testLongArray() throws Exception { new JcrPropertyMapCacheEntry(new Long[0], node); new JcrPropertyMapCacheEntry(new long[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testFloatArray() throws Exception { new JcrPropertyMapCacheEntry(new Float[0], node); new JcrPropertyMapCacheEntry(new float[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testDoubleArray() throws Exception { new JcrPropertyMapCacheEntry(new Double[0], node); new JcrPropertyMapCacheEntry(new double[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testBooleanArray() throws Exception { new JcrPropertyMapCacheEntry(new Boolean[0], node); new JcrPropertyMapCacheEntry(new boolean[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test public void testCharArray() throws Exception { new JcrPropertyMapCacheEntry(new Character[0], node); new JcrPropertyMapCacheEntry(new char[0], node); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test(expected = IllegalArgumentException.class) @@ -160,7 +159,7 @@ public class JcrPropertyMapCacheEntryTest { String result = entry.convertToType(String.class, node, null); assertEquals("test", result); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -170,7 +169,7 @@ public class JcrPropertyMapCacheEntryTest { Long result = entry.convertToType(Long.class, node, null); assertNull(result); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -181,7 +180,7 @@ public class JcrPropertyMapCacheEntryTest { Integer[] result = entry.convertToType(Integer[].class, node, null); assertNotNull(result); assertEquals(0, result.length); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -201,8 +200,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getType(); verify(prop).getLength(); verifyNoMoreInteractions(prop); - - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -225,7 +223,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getType(); verify(prop).getLength(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -250,7 +248,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getType(); verify(prop, times(2)).getLengths(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -260,7 +258,7 @@ public class JcrPropertyMapCacheEntryTest { JcrPropertyMapCacheEntry entry = new JcrPropertyMapCacheEntry(in, node); ObjectInputStream result = entry.convertToType(ObjectInputStream.class, node, null); assertNull(result); // TODO: is this the expected result? - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -274,7 +272,7 @@ public class JcrPropertyMapCacheEntryTest { // same type Map<?,?> result = entry.convertToType(HashMap.class, node, null); assertNotNull(result); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -289,7 +287,7 @@ public class JcrPropertyMapCacheEntryTest { Calendar result = entry.convertToType(Calendar.class, node, LinkedHashMap.class.getClassLoader()); assertNull(result); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -307,7 +305,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getValue(); verify(prop).getType(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -330,7 +328,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getValues(); verify(prop).getType(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -352,7 +350,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getValues(); verify(prop).getType(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -372,7 +370,7 @@ public class JcrPropertyMapCacheEntryTest { verify(prop).getValue(); verify(prop).getType(); verifyNoMoreInteractions(prop); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); } @Test @@ -430,7 +428,7 @@ public class JcrPropertyMapCacheEntryTest { Property result = entry.convertToType(Property.class, node, null); assertSame(prop, result); - verifyZeroInteractions(node); + verifyNoMoreInteractions(node); verify(prop).getType(); verify(prop).getValue(); verify(prop, times(2)).isMultiple(); diff --git a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/BinaryDownloadUriProviderTest.java b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/BinaryDownloadUriProviderTest.java index e454745..1f12885 100644 --- a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/BinaryDownloadUriProviderTest.java +++ b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/BinaryDownloadUriProviderTest.java @@ -47,10 +47,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class BinaryDownloadUriProviderTest { @@ -87,7 +87,7 @@ public class BinaryDownloadUriProviderTest { }; Mockito.when(property.getBinary()).thenReturn(binaryDownload); URI myUri = new URI("https://example.com/mybinary";); - Mockito.when(binaryDownload.getURI(Matchers.any(BinaryDownloadOptions.class))).thenReturn(myUri); + Mockito.when(binaryDownload.getURI(ArgumentMatchers.any(BinaryDownloadOptions.class))).thenReturn(myUri); assertEquals(myUri, uriProvider.toURI(fileResource, Scope.EXTERNAL, Operation.READ)); ArgumentCaptor<BinaryDownloadOptions> argumentCaptor = ArgumentCaptor.forClass(BinaryDownloadOptions.class); diff --git a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/ContextUtilTest.java b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/ContextUtilTest.java index dbf0cf3..7ed7699 100644 --- a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/ContextUtilTest.java +++ b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/ContextUtilTest.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; public class ContextUtilTest { @@ -114,7 +113,7 @@ public class ContextUtilTest { verify(ctx, times(3)).getProviderState(); verifyNoMoreInteractions(ctx); - verifyZeroInteractions(state); + verifyNoMoreInteractions(state); } } \ No newline at end of file diff --git a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderSessionHandlingTest.java b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderSessionHandlingTest.java index f4f83f5..433d8c8 100644 --- a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderSessionHandlingTest.java +++ b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderSessionHandlingTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeTrue; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -54,7 +53,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -211,7 +210,7 @@ public class JcrResourceProviderSessionHandlingTest { Bundle mockBundle = mock(Bundle.class); BundleContext mockBundleContext = mock(BundleContext.class); when(mockBundle.getBundleContext()).thenReturn(mockBundleContext); - when(mockBundleContext.getService(Matchers.any())).thenReturn(repo); + when(mockBundleContext.getService(ArgumentMatchers.any())).thenReturn(repo); authInfo.put(ResourceResolverFactory.SUBSERVICE, "dummy-service"); authInfo.put(ResourceProvider.AUTH_SERVICE_BUNDLE, mockBundle); break; @@ -226,7 +225,7 @@ public class JcrResourceProviderSessionHandlingTest { } ComponentContext ctx = mock(ComponentContext.class); - when(ctx.locateService(anyString(), Mockito.any())).thenReturn(repo); + when(ctx.locateService(ArgumentMatchers.anyString(), Mockito.any())).thenReturn(repo); jcrResourceProvider = new JcrResourceProvider(); jcrResourceProvider.activate(ctx); diff --git a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java index ecac826..ae2b088 100644 --- a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java +++ b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java @@ -18,15 +18,19 @@ */ package org.apache.sling.jcr.resource.internal.helper.jcr; +import static javax.jcr.nodetype.NodeType.NT_UNSTRUCTURED; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.security.Principal; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; import javax.jcr.Node; -import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; + import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.sling.api.resource.PersistenceException; @@ -41,15 +45,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.osgi.framework.ServiceReference; +import org.mockito.junit.MockitoJUnitRunner; import org.osgi.service.component.ComponentContext; -import static javax.jcr.nodetype.NodeType.NT_UNSTRUCTURED; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class JcrResourceProviderTest extends SlingRepositoryTestBase { @@ -62,9 +60,7 @@ public class JcrResourceProviderTest extends SlingRepositoryTestBase { super.setUp(); // create the session session = getSession(); - Repository repo = getRepository(); ComponentContext ctx = mock(ComponentContext.class); - when(ctx.locateService(Mockito.anyString(), Mockito.any(ServiceReference.class))).thenReturn(repo); jcrResourceProvider = new JcrResourceProvider(); jcrResourceProvider.activate(ctx); }
