You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/05/21 20:08:07 UTC
[sling-org-apache-sling-caconfig-impl] 01/01: SLING-8272 add unit
tests
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-caconfig-impl.git
commit ebce04e76d2bec3c1b19c1a0d7a64ae2c7cb2d0b
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue May 21 22:06:34 2019 +0200
SLING-8272 add unit tests
---
.../ConfigurationResolverAnnotationClassTest.java | 28 ++++++++++++++++++++++
.../impl/ConfigurationResolverValueMapTest.java | 22 +++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java b/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
index 5a477b3..beb2122 100644
--- a/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
+++ b/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
@@ -22,6 +22,7 @@ import static org.apache.sling.caconfig.impl.def.ConfigurationDefNameConstants.P
import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -77,12 +78,16 @@ public class ConfigurationResolverAnnotationClassTest {
assertNull(cfg.stringParam());
assertEquals(5, cfg.intParam());
assertEquals(false, cfg.boolParam());
+
+ assertFalse(underTest.get(site1Page1).has(SimpleConfig.class));
}
@Test
public void testNonExistingConfig_List() {
Collection<ListConfig> cfgList = underTest.get(site1Page1).asCollection(ListConfig.class);
assertTrue(cfgList.isEmpty());
+
+ assertFalse(underTest.get(site1Page1).has(ListConfig.class));
}
@Test
@@ -92,6 +97,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertNull(cfg.stringParam());
assertNotNull(cfg.subConfig());
assertNotNull(cfg.subListConfig());
+
+ assertFalse(underTest.get(site1Page1).has(NestedConfig.class));
}
@@ -107,6 +114,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("configValue1", cfg.stringParam());
assertEquals(111, cfg.intParam());
assertEquals(true, cfg.boolParam());
+
+ assertTrue(underTest.get(site1Page1).has(SimpleConfig.class));
}
@Test
@@ -126,6 +135,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("configValue2", cfg.stringParam());
assertEquals(222, cfg.intParam());
assertEquals(true, cfg.boolParam());
+
+ assertTrue(underTest.get(site1Page1).has(SimpleConfig.class));
}
@Test
@@ -140,6 +151,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("configValue1.1", cfg.stringParam());
assertEquals(1111, cfg.intParam());
assertEquals(true, cfg.boolParam());
+
+ assertTrue(underTest.get(site1Page1).name("sampleName").has(SimpleConfig.class));
}
@Test
@@ -157,6 +170,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("value1", cfgIterator.next().stringParam());
assertEquals("value2", cfgIterator.next().stringParam());
assertEquals("value3", cfgIterator.next().stringParam());
+
+ assertTrue(underTest.get(site1Page1).has(ListConfig.class));
}
@Test
@@ -192,6 +207,8 @@ public class ConfigurationResolverAnnotationClassTest {
ListNestedConfig config3 = cfgList.get(2);
assertEquals("value3", config3.stringParam());
assertEquals(0, config3.subListConfig().length);
+
+ assertTrue(underTest.get(site1Page1).has(ListNestedConfig.class));
}
@Test
@@ -240,6 +257,8 @@ public class ConfigurationResolverAnnotationClassTest {
ListDoubleNestedConfig config3 = cfgList.get(2);
assertEquals("value3", config3.stringParam());
assertEquals(0, config3.subListNestedConfig().length);
+
+ assertTrue(underTest.get(site1Page1).has(ListDoubleNestedConfig.class));
}
@Test
@@ -264,6 +283,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals(333, cfgList.get(1).intParam());
assertEquals("configValue1.1", cfgList.get(2).stringParam());
assertEquals(111, cfgList.get(2).intParam());
+
+ assertTrue(underTest.get(site1Page1).has(ListConfig.class));
}
@Test
@@ -293,6 +314,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("configValue2.1", listConfig[0].stringParam());
assertEquals("configValue2.2", listConfig[1].stringParam());
assertEquals("configValue2.3", listConfig[2].stringParam());
+
+ assertTrue(underTest.get(site1Page1).has(NestedConfig.class));
}
@Test
@@ -312,6 +335,8 @@ public class ConfigurationResolverAnnotationClassTest {
assertEquals("configValue4", subConfig.stringParam());
assertEquals(111, subConfig.intParam());
assertEquals(true, subConfig.boolParam());
+
+ assertTrue(underTest.get(site1Page1).has(NestedConfig.class));
}
@Test(expected=ConfigurationResolveException.class)
@@ -327,12 +352,15 @@ public class ConfigurationResolverAnnotationClassTest {
assertNull(cfg.stringParam());
assertEquals(5, cfg.intParam());
assertEquals(false, cfg.boolParam());
+
+ assertFalse(underTest.get(null).has(NestedConfig.class));
}
@Test
public void testNonExistingContentResource_List() {
Collection<ListConfig> cfgList = underTest.get(null).asCollection(ListConfig.class);
assertTrue(cfgList.isEmpty());
+ assertFalse(underTest.get(null).has(ListConfig.class));
}
@Test
diff --git a/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java b/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java
index da74135..ca2278a 100644
--- a/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java
+++ b/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java
@@ -20,6 +20,7 @@ package org.apache.sling.caconfig.impl;
import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -71,12 +72,16 @@ public class ConfigurationResolverValueMapTest {
assertNull(props.get("stringParam", String.class));
assertEquals(0, (int)props.get("intParam", 0));
assertEquals(false, props.get("boolParam", false));
+
+ assertFalse(underTest.get(site1Page1).has("sampleName"));
}
@Test
public void testNonExistingConfigCollection() {
Collection<ValueMap> propsList = underTest.get(site1Page1).name("sampleList").asValueMapCollection();
assertTrue(propsList.isEmpty());
+
+ assertFalse(underTest.get(site1Page1).has("sampleList"));
}
@Test
@@ -91,6 +96,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("configValue1", props.get("stringParam", String.class));
assertEquals(111, (int)props.get("intParam", 0));
assertEquals(true, props.get("boolParam", false));
+
+ assertTrue(underTest.get(site1Page1).has("sampleName"));
}
@Test
@@ -107,6 +114,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("configValue1.1", propsIterator.next().get("stringParam", String.class));
assertEquals("configValue1.2", propsIterator.next().get("stringParam", String.class));
assertEquals("configValue1.3", propsIterator.next().get("stringParam", String.class));
+
+ assertTrue(underTest.get(site1Page1).has("sampleList"));
}
@Test
@@ -122,6 +131,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("defValue1", props.get("stringParam", String.class));
assertEquals(999, (int)props.get("intParam", 0));
assertEquals(true, props.get("boolParam", false));
+
+ assertTrue(underTest.get(site1Page1).has("sampleName"));
}
@Test
@@ -143,6 +154,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals(999, (int)propsList.get(1).get("intParam", 0));
assertEquals("configValue1.3", propsList.get(2).get("stringParam", String.class));
assertEquals(999, (int)propsList.get(2).get("intParam", 0));
+
+ assertTrue(underTest.get(site1Page1).has("sampleList"));
}
@Test
@@ -160,6 +173,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("override1", props.get("stringParam", String.class));
assertEquals(222, (int)props.get("intParam", 0));
assertEquals(false, props.get("boolParam", false));
+
+ assertTrue(underTest.get(site1Page1).has("sampleName"));
}
/**
@@ -175,6 +190,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("override1", props.get("stringParam", String.class));
assertEquals(222, (int)props.get("intParam", 0));
assertEquals(false, props.get("boolParam", false));
+
+ assertFalse(underTest.get(site1Page1).has("sampleName"));
}
@Test
@@ -194,6 +211,8 @@ public class ConfigurationResolverValueMapTest {
assertEquals("override1", propsIterator.next().get("stringParam", String.class));
assertEquals("override1", propsIterator.next().get("stringParam", String.class));
assertEquals("override1", propsIterator.next().get("stringParam", String.class));
+
+ assertTrue(underTest.get(site1Page1).has("sampleList"));
}
@Test
@@ -203,12 +222,15 @@ public class ConfigurationResolverValueMapTest {
assertNull(props.get("stringParam", String.class));
assertEquals(0, (int)props.get("intParam", 0));
assertEquals(false, props.get("boolParam", false));
+
+ assertFalse(underTest.get(null).has("sampleName"));
}
@Test
public void testNonExistingContentResourceCollection() {
Collection<ValueMap> propsList = underTest.get(null).name("sampleList").asValueMapCollection();
assertTrue(propsList.isEmpty());
+ assertFalse(underTest.get(null).has("sampleList"));
}
@Test(expected=IllegalArgumentException.class)