Commit 7bc76abb authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Added nested unit test for merge conflicts

parent a51bf527
......@@ -214,6 +214,15 @@ class ConfigUtilsTest extends TestNGSuite with Matchers {
mergeMaps(map2, map1, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> "21")
mergeMaps(map2, map2, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> "22")
}
@Test def testNestedMergeConflict: Unit = {
val map1 = Map("c" -> Map("x" -> "1"))
val map2 = Map("c" -> Map("x" -> "1"))
mergeMaps(map1, map2) shouldBe Map("c" -> Map("x" -> "1"))
mergeMaps(map1, map2, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> Map("x" -> "12"))
mergeMaps(map2, map1, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> Map("x" -> "21"))
mergeMaps(map2, map2, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> Map("x" -> "22"))
}
}
object ConfigUtilsTest {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment