From 485f910d55be97cd9a3b502e65544741758974e4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 27 Dec 2014 16:26:52 -0500 Subject: [PATCH] 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. --- .../com/typesafe/config/impl/ConfigSubstitutionTest.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala index 2eff0545..e0dcdcc5 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala @@ -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 = {