Change expected result of delayedMergeObjectResolveProblem5

Our "do not look at what we're resolving in order to resolve it"
algorithm is now more robust so we get a different answer.
This commit is contained in:
Havoc Pennington 2014-12-27 16:26:52 -05:00
parent 53d642d93f
commit 485f910d55

View File

@ -466,7 +466,8 @@ class ConfigSubstitutionTest extends TestUtils {
private val delayedMergeObjectResolveProblem5 = {
parseObject("""
defaults {
a = ${item1.b} // tricky cycle
a = ${item1.b} // tricky cycle - we won't see ${defaults}
// as we resolve this
b = 2
}
@ -488,7 +489,7 @@ class ConfigSubstitutionTest extends TestUtils {
assertEquals("item1.b", 2, resolved.getInt("item1.b"))
assertEquals("item2.b", 2, resolved.getInt("item2.b"))
assertEquals("defaults.a", 2, resolved.getInt("defaults.a"))
assertEquals("defaults.a", 7, resolved.getInt("defaults.a"))
}
private val delayedMergeObjectResolveProblem6 = {