mirror of
https://github.com/lightbend/config.git
synced 2025-03-22 23:30:27 +08:00
additional tests recommended in review comments
This commit is contained in:
parent
3cadb2756d
commit
63cd4351c6
@ -241,7 +241,7 @@ final class ConfigDocumentParser {
|
|||||||
AbstractConfigNodeValue v = null;
|
AbstractConfigNodeValue v = null;
|
||||||
int startingEqualsCount = equalsCount;
|
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);
|
v = new ConfigNodeSimpleValue(t);
|
||||||
} else if (t == Tokens.OPEN_CURLY) {
|
} else if (t == Tokens.OPEN_CURLY) {
|
||||||
v = parseObject(true);
|
v = parseObject(true);
|
||||||
|
@ -787,6 +787,18 @@ class ConfParserTest extends TestUtils {
|
|||||||
assertTrue(s"expected match for <$expected> but got <$actual>", actual.matches(expected))
|
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
|
@Test
|
||||||
def includeRequiredFound() {
|
def includeRequiredFound() {
|
||||||
val confs = Seq(
|
val confs = Seq(
|
||||||
|
@ -97,6 +97,13 @@ class TokenizerTest extends TestUtils {
|
|||||||
tokenizerTest(expected, source)
|
tokenizerTest(expected, source)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
def tokenizeUnquotedTextContainingRoundBrace() {
|
||||||
|
val source = """(footrue)"""
|
||||||
|
val expected = List(tokenUnquoted("(footrue)"))
|
||||||
|
tokenizerTest(expected, source)
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
def tokenizeUnquotedTextContainingTrue() {
|
def tokenizeUnquotedTextContainingTrue() {
|
||||||
val source = """footrue"""
|
val source = """footrue"""
|
||||||
|
Loading…
Reference in New Issue
Block a user