diff --git a/scripts/small.toy b/scripts/small.toy index 760e739..2f88e8c 100644 --- a/scripts/small.toy +++ b/scripts/small.toy @@ -1,36 +1,14 @@ import compound; -//test array concat + +//test dictionary concat with clashing keys { - var a = [1, 2, 3]; - var b = [4, 5, 6]; - - var c = a.concat(b).concat(b); - - assert c == [1, 2, 3, 4, 5, 6, 4, 5, 6], "array.concat() failed"; -} - -//test dictionary concat -{ - var a = ["one" : 1, "two": 2, "three": 3]; - var b = ["four" : 4, "five": 5, "six": 6]; + var a = ["one" : 1, "two": 2, "three": 3, "random": 1]; + var b = ["four" : 4, "five": 5, "six": 6, "random": 2]; var c = a.concat(b); - assert c.length() == 6, "dictionary.concat().length() failed"; - - assert c == ["one" : 1, "two": 2, "three": 3, "four" : 4, "five": 5, "six": 6], "dictionary.concat() comparison failed"; + assert c["random"] == 1, "dictionary.concat() clashing keys failed"; } -//test string concat -{ - var a = "foo"; - var b = "bar"; - - var c = a.concat(b); - - assert c == "foobar", "string.concat() failed"; -} - - print "All good"; diff --git a/test/scripts/lib/compound.toy b/test/scripts/lib/compound.toy index 36d73b1..9c2a649 100644 --- a/test/scripts/lib/compound.toy +++ b/test/scripts/lib/compound.toy @@ -23,6 +23,16 @@ import compound; assert c == ["one" : 1, "two": 2, "three": 3, "four" : 4, "five": 5, "six": 6], "dictionary.concat() comparison failed"; } + //test dictionary concat with clashing keys + { + var a = ["one" : 1, "two": 2, "three": 3, "random": 1]; + var b = ["four" : 4, "five": 5, "six": 6, "random": 2]; + + var c = a.concat(b); + + assert c["random"] == 1, "dictionary.concat() clashing keys failed"; + } + //test string concat { var a = "foo";