This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13118-update-test-deps in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit eb10d203a314ba65449bd1c22f88fe233541c1a2 Author: Stefan Seifert <[email protected]> AuthorDate: Mon Feb 16 10:54:13 2026 +0100 SLING-13118 update test dependencies, eliminate usage of guava in test code --- pom.xml | 4 +-- .../caconfig/resource/spi/ContextResource.java | 4 +-- .../ConfigurationCollectionPersistDataTest.java | 36 +++++++++++----------- .../spi/metadata/ConfigurationMetadataTest.java | 15 ++++----- .../spi/metadata/PropertyMetadataTest.java | 9 +++--- 5 files changed, 32 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index f16090f..1308a6e 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> - <version>3.2.2</version> + <version>3.6.0</version> <scope>test</scope> </dependency> <dependency> @@ -104,7 +104,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>4.1.0</version> + <version>5.21.0</version> <scope>test</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java b/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java index c2e00c3..5a8de8e 100644 --- a/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java +++ b/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java @@ -18,7 +18,7 @@ */ package org.apache.sling.caconfig.resource.spi; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.apache.sling.api.resource.Resource; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -90,7 +90,7 @@ public final class ContextResource { @Override public boolean equals(Object obj) { if (obj instanceof ContextResource) { - return StringUtils.equals(key, ((ContextResource) obj).key); + return Strings.CS.equals(key, ((ContextResource) obj).key); } return false; } diff --git a/src/test/java/org/apache/sling/caconfig/spi/ConfigurationCollectionPersistDataTest.java b/src/test/java/org/apache/sling/caconfig/spi/ConfigurationCollectionPersistDataTest.java index 68d3c22..4be8f09 100644 --- a/src/test/java/org/apache/sling/caconfig/spi/ConfigurationCollectionPersistDataTest.java +++ b/src/test/java/org/apache/sling/caconfig/spi/ConfigurationCollectionPersistDataTest.java @@ -19,10 +19,9 @@ package org.apache.sling.caconfig.spi; import java.util.Collection; +import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -38,10 +37,10 @@ public class ConfigurationCollectionPersistDataTest { @Test public void testProperties() { - Collection<ConfigurationPersistData> items = ImmutableList.of( - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item1"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item2"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item3")); + Collection<ConfigurationPersistData> items = List.of( + new ConfigurationPersistData(Map.of()).collectionItemName("item1"), + new ConfigurationPersistData(Map.of()).collectionItemName("item2"), + new ConfigurationPersistData(Map.of()).collectionItemName("item3")); ConfigurationCollectionPersistData underTest = new ConfigurationCollectionPersistData(items).properties(props); @@ -51,30 +50,31 @@ public class ConfigurationCollectionPersistDataTest { @Test(expected = ConfigurationPersistenceException.class) public void testItemsDuplicateKeys() { - Collection<ConfigurationPersistData> itemList = ImmutableList.of( - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item1"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item2"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item1")); + Collection<ConfigurationPersistData> itemList = List.of( + new ConfigurationPersistData(Map.of()).collectionItemName("item1"), + new ConfigurationPersistData(Map.of()).collectionItemName("item2"), + new ConfigurationPersistData(Map.of()).collectionItemName("item1")); new ConfigurationCollectionPersistData(itemList); } @Test(expected = ConfigurationPersistenceException.class) + @SuppressWarnings("null") public void testItemsMissingItemName() { - Collection<ConfigurationPersistData> itemList = ImmutableList.of( - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item1"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item2"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of())); + Collection<ConfigurationPersistData> itemList = List.of( + new ConfigurationPersistData(Map.of()).collectionItemName("item1"), + new ConfigurationPersistData(Map.of()).collectionItemName("item2"), + new ConfigurationPersistData(Map.of())); new ConfigurationCollectionPersistData(itemList); } @Test(expected = ConfigurationPersistenceException.class) public void testItemsInvalidItemNAme() { - Collection<ConfigurationPersistData> itemList = ImmutableList.of( - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item1"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item2"), - new ConfigurationPersistData(ImmutableMap.<String, Object>of()).collectionItemName("item #1")); + Collection<ConfigurationPersistData> itemList = List.of( + new ConfigurationPersistData(Map.of()).collectionItemName("item1"), + new ConfigurationPersistData(Map.of()).collectionItemName("item2"), + new ConfigurationPersistData(Map.of()).collectionItemName("item #1")); new ConfigurationCollectionPersistData(itemList); } diff --git a/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java b/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java index 8012344..aa39663 100644 --- a/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java +++ b/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java @@ -18,10 +18,9 @@ */ package org.apache.sling.caconfig.spi.metadata; +import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -32,13 +31,12 @@ public class ConfigurationMetadataTest { @Test public void testProps() { - ConfigurationMetadata underTest = - new ConfigurationMetadata("name1", ImmutableList.<PropertyMetadata<?>>of(), false); + ConfigurationMetadata underTest = new ConfigurationMetadata("name1", List.<PropertyMetadata<?>>of(), false); assertEquals("name1", underTest.getName()); assertTrue(underTest.isSingleton()); assertFalse(underTest.isCollection()); - Map<String, String> props = ImmutableMap.of("p1", "v1"); + Map<String, String> props = Map.of("p1", "v1"); underTest.label("label1").description("desc1").properties(props); assertEquals("label1", underTest.getLabel()); @@ -48,8 +46,7 @@ public class ConfigurationMetadataTest { @Test public void testCollectionProps() { - ConfigurationMetadata underTest = - new ConfigurationMetadata("name1", ImmutableList.<PropertyMetadata<?>>of(), true); + ConfigurationMetadata underTest = new ConfigurationMetadata("name1", List.<PropertyMetadata<?>>of(), true); assertEquals("name1", underTest.getName()); assertFalse(underTest.isSingleton()); assertTrue(underTest.isCollection()); @@ -59,7 +56,7 @@ public class ConfigurationMetadataTest { public void testPropertyMap() { ConfigurationMetadata underTest = new ConfigurationMetadata( "name1", - ImmutableList.<PropertyMetadata<?>>of( + List.<PropertyMetadata<?>>of( new PropertyMetadata<>("prop1", "devValue"), new PropertyMetadata<>("prop2", 5)), false); assertEquals(2, underTest.getPropertyMetadata().size()); @@ -71,7 +68,7 @@ public class ConfigurationMetadataTest { public void testDuplicateKey() { new ConfigurationMetadata( "name1", - ImmutableList.<PropertyMetadata<?>>of( + List.<PropertyMetadata<?>>of( new PropertyMetadata<>("prop1", "devValue"), new PropertyMetadata<>("prop1", 5)), false); } diff --git a/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java b/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java index daa171f..f92dc7a 100644 --- a/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java +++ b/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java @@ -18,10 +18,9 @@ */ package org.apache.sling.caconfig.spi.metadata; +import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -30,14 +29,14 @@ import static org.junit.Assert.assertSame; public class PropertyMetadataTest { @Test + @SuppressWarnings("null") public void testProps() { PropertyMetadata<String> underTest = new PropertyMetadata<>("name1", String.class); assertEquals("name1", underTest.getName()); assertEquals(String.class, underTest.getType()); - ConfigurationMetadata configMetadata = - new ConfigurationMetadata("test", ImmutableList.<PropertyMetadata<?>>of(), false); - Map<String, String> props = ImmutableMap.of("p1", "v1"); + ConfigurationMetadata configMetadata = new ConfigurationMetadata("test", List.<PropertyMetadata<?>>of(), false); + Map<String, String> props = Map.of("p1", "v1"); underTest .label("label1") .description("desc1")
