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-testing-caconfig-mock-plugin.git
commit 778128a18a994b93f00cd3f65fc9d62d1339f00f Author: Stefan Seifert <[email protected]> AuthorDate: Fri Dec 8 12:10:30 2023 +0100 cosmetic: get rid of guava in unit tests --- .../mock/caconfig/MockContextAwareConfigTest.java | 58 +++++++++++----------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/src/test/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfigTest.java b/src/test/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfigTest.java index f040654..9170091 100644 --- a/src/test/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfigTest.java +++ b/src/test/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfigTest.java @@ -25,6 +25,8 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.sling.api.resource.Resource; import org.apache.sling.caconfig.ConfigurationBuilder; @@ -34,7 +36,6 @@ import org.apache.sling.testing.mock.caconfig.example.NestedConfigSub; import org.apache.sling.testing.mock.caconfig.example.NestedConfigSub2; import org.apache.sling.testing.mock.caconfig.example.NestedListConfig; import org.apache.sling.testing.mock.caconfig.example.SimpleConfig; -import org.apache.sling.testing.mock.sling.builder.ImmutableValueMap; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.apache.sling.testing.mock.sling.junit.SlingContextBuilder; import org.jetbrains.annotations.NotNull; @@ -43,9 +44,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - public class MockContextAwareConfigTest { @Rule @@ -74,9 +72,9 @@ public class MockContextAwareConfigTest { @Test public void testCollectionConfig() { - MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", ListConfig.class, ImmutableList.of( - ImmutableMap.<String,Object>of("stringParam", "value1"), - ImmutableMap.<String,Object>of("stringParam", "value2"))); + MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", ListConfig.class, List.of( + Map.of("stringParam", "value1"), + Map.of("stringParam", "value2"))); Collection<ListConfig> config = getConfigCollection(ListConfig.class); assertEquals(2, config.size()); @@ -93,10 +91,10 @@ public class MockContextAwareConfigTest { @Test public void testCollectionConfig_DifferentOrder() { - MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", ListConfig.class, ImmutableList.of( - ImmutableMap.<String,Object>of("stringParam", "value2"), - ImmutableMap.<String,Object>of("stringParam", "value3"), - ImmutableMap.<String,Object>of("stringParam", "value1"))); + MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", ListConfig.class, List.of( + Map.of("stringParam", "value2"), + Map.of("stringParam", "value3"), + Map.of("stringParam", "value1"))); Collection<ListConfig> config = getConfigCollection(ListConfig.class); assertEquals(3, config.size()); @@ -119,15 +117,15 @@ public class MockContextAwareConfigTest { public void testNestedSingletonConfig() { MockContextAwareConfig.writeConfiguration(context, "/content/region/site", NestedConfig.class, "stringParam", "value1", - "sub", ImmutableList.of( - ImmutableValueMap.of("subStringParam", "v1", "intParam", 5, "stringArrayParam", new String[] {"v1a","v1b"}), - ImmutableValueMap.of("subStringParam", "v2")), - "sub2", ImmutableValueMap.of( + "sub", List.of( + Map.of("subStringParam", "v1", "intParam", 5, "stringArrayParam", new String[] {"v1a","v1b"}), + Map.of("subStringParam", "v2")), + "sub2", Map.of( "sub2StringParam", "v3", - "sub", ImmutableValueMap.of("subStringParam", "v4"), - "subList", ImmutableList.of(ImmutableValueMap.of("subStringParam", "v5a"),ImmutableValueMap.of("subStringParam", "v5b"))), - "sub2List", ImmutableList.of( - ImmutableValueMap.of("sub2StringParam", "v6"))); + "sub", Map.of("subStringParam", "v4"), + "subList", List.of(Map.of("subStringParam", "v5a"),Map.of("subStringParam", "v5b"))), + "sub2List", List.of( + Map.of("sub2StringParam", "v6"))); NestedConfig config = getConfig(NestedConfig.class); assertEquals("value1", config.stringParam()); @@ -154,18 +152,18 @@ public class MockContextAwareConfigTest { @Test public void testNestedCollectionConfigConfig() { - MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", NestedListConfig.class, ImmutableList.of( - ImmutableMap.<String,Object>of("stringParam", "value1", - "sub", ImmutableList.of( - ImmutableValueMap.of("subStringParam", "v1", "intParam", 5, "stringArrayParam", new String[] {"v1a","v1b"}), - ImmutableValueMap.of("subStringParam", "v2")), - "sub2", ImmutableValueMap.of( + MockContextAwareConfig.writeConfigurationCollection(context, "/content/region/site", NestedListConfig.class, List.of( + Map.of("stringParam", "value1", + "sub", List.of( + Map.of("subStringParam", "v1", "intParam", 5, "stringArrayParam", new String[] {"v1a","v1b"}), + Map.of("subStringParam", "v2")), + "sub2", Map.of( "sub2StringParam", "v3", - "sub", ImmutableValueMap.of("subStringParam", "v4"), - "subList", ImmutableList.of(ImmutableValueMap.of("subStringParam", "v5a"),ImmutableValueMap.of("subStringParam", "v5b"))), - "sub2List", ImmutableList.of( - ImmutableValueMap.of("sub2StringParam", "v6"))), - ImmutableMap.<String,Object>of("stringParam", "value2"))); + "sub", Map.of("subStringParam", "v4"), + "subList", List.of(Map.of("subStringParam", "v5a"),Map.of("subStringParam", "v5b"))), + "sub2List", List.of( + Map.of("sub2StringParam", "v6"))), + Map.of("stringParam", "value2"))); Collection<NestedListConfig> config = getConfigCollection(NestedListConfig.class); assertEquals(2, config.size());
