github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-14 19:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small modifications to some tests

Browse Source
This commit is contained in:
Philippe Collin 2016-03-30 14:01:35 -04:00
parent 909b11854b
commit 90dd9b960c
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/com/typesafe/config/impl/SimpleConfig.java
View File

@ -838,7 +838,7 @@ final class SimpleConfig implements Config, MergeableValue, Serializable {
}
} else if (referenceType == ConfigValueType.LIST) {
// objects may be convertible to lists if they have numeric keys
// empty strings may also be converted to lists
// strings may also be convertible to lists if empty
if (value instanceof SimpleConfigList || value instanceof SimpleConfigObject || value instanceof ConfigString) {
return true;
} else {

5
config/src/test/java/beanconfig/ArraysConfig.java
View File

@ -11,6 +11,7 @@ import com.typesafe.config.ConfigValue;
public class ArraysConfig {
List<Integer> empty;
List<Integer> fromEmptyString;
List<Integer> ofInt;
List<String> ofString;
List<Double> ofDouble;
@ -33,6 +34,10 @@ public class ArraysConfig {
this.empty = empty;
}
public List<Integer> getFromEmptyString() { return fromEmptyString; }
public void setFromEmptyString(List<Integer> fromEmptyString) { this.fromEmptyString = fromEmptyString; }
public List<Integer> getOfInt() {
return ofInt;
}

1
config/src/test/resources/beanconfig/beanconfig01.conf
View File

@ -40,6 +40,7 @@
"arrays" : {
"empty" : [],
"fromEmptyString": "",
"ofInt" : [1, 2, 3],
"ofString" : [ ${strings.a}, ${strings.b}, ${strings.c} ],
"of-double" : [3.14, 4.14, 5.14],

4
config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala
View File

@ -48,8 +48,7 @@ class ConfigBeanFactoryTest extends TestUtils {
val expecteds = Seq(Missing("propNotListedInConfig", 77, "string"),
WrongType("shouldBeInt", 78, "number", "boolean"),
WrongType("should-be-boolean", 79, "boolean", "number"),
WrongType("should-be-list", 80, "list", "string"))
WrongType("should-be-boolean", 79, "boolean", "number"))
checkValidationException(e, expecteds)
}
@ -90,6 +89,7 @@ class ConfigBeanFactoryTest extends TestUtils {
val beanConfig: ArraysConfig = ConfigBeanFactory.create(loadConfig().getConfig("arrays"), classOf[ArraysConfig])
assertNotNull(beanConfig)
assertEquals(List().asJava, beanConfig.getEmpty)
assertEquals(List().asJava, beanConfig.getFromEmptyString)
assertEquals(List(1, 2, 3).asJava, beanConfig.getOfInt)
assertEquals(List(32L, 42L, 52L).asJava, beanConfig.getOfLong)
assertEquals(List("a", "b", "c").asJava, beanConfig.getOfString)

4
config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
View File

@ -673,6 +673,10 @@ class ConfigTest extends TestUtils {
conf.getObjectList("arrays.ofInt")
}
intercept[ConfigException.WrongType] {
conf.getList("strings.abcd")
}
intercept[ConfigException.WrongType] {
conf.getMilliseconds("ints")
}