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

additional tests recommended in review comments

Browse Source
This commit is contained in:
John Lonergan 2016-08-24 01:34:28 +01:00
parent 3cadb2756d
commit 63cd4351c6
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,7 @@ final class ConfigDocumentParser {
AbstractConfigNodeValue v = null;
int startingEqualsCount = equalsCount;
if (Tokens.isValue(t) || Tokens.isUnquotedText(t) || Tokens.isSubstitution(t)) {
if (Tokens.isValue(t) || Tokens.isUnquotedText(t) || Tokens.isSubstitution(t)|| t == Tokens.OPEN_ROUND) {
v = new ConfigNodeSimpleValue(t);
} else if (t == Tokens.OPEN_CURLY) {
v = parseObject(true);

12
config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
View File

@ -787,6 +787,18 @@ class ConfParserTest extends TestUtils {
assertTrue(s"expected match for <$expected> but got <$actual>", actual.matches(expected))
}
@Test
def includeRequiredFoundButNestedIncludeMissing() {
// set this to allowMissing=true to demonstrate that the missing inclusion causes failure despite this setting
val missing = ConfigParseOptions.defaults().setAllowMissing(true)
val conf = ConfigFactory.parseString("include required(classpath( \"test03\") )", missing)
val expected = "This is in the included file"
val actual = conf.getString("foo")
assertTrue(s"expected match for <$expected> but got <$actual>", actual.matches(expected))
}
@Test
def includeRequiredFound() {
val confs = Seq(

7
config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
View File

@ -97,6 +97,13 @@ class TokenizerTest extends TestUtils {
tokenizerTest(expected, source)
}
@Test
def tokenizeUnquotedTextContainingRoundBrace() {
val source = """(footrue)"""
val expected = List(tokenUnquoted("(footrue)"))
tokenizerTest(expected, source)
}
@Test
def tokenizeUnquotedTextContainingTrue() {
val source = """footrue"""