From b8a23b072fa0467650be1b56672e0b830d7c8f99 Mon Sep 17 00:00:00 2001 From: Aleksandar Pokopec Date: Tue, 15 Feb 2011 10:05:23 +0000 Subject: Revert "Added missing string prefixes for names... Revert "Added missing string prefixes for names of map and set collection classes." and related commits. No review. --- test/files/jvm/serialization.check | 28 ++++++++++++++-------------- test/files/run/bug1074.check | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'test/files') diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index ae7cc2d88d..0717de2a8e 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -77,20 +77,20 @@ x = BitSet(2, 3) y = BitSet(2, 3) x equals y: true, y equals x: true -x = HashMap(1 -> A, 2 -> B, 3 -> C) -y = HashMap(1 -> A, 2 -> B, 3 -> C) +x = Map(1 -> A, 2 -> B, 3 -> C) +y = Map(1 -> A, 2 -> B, 3 -> C) x equals y: true, y equals x: true -x = HashSet(1, 2) -y = HashSet(1, 2) +x = Set(1, 2) +y = Set(1, 2) x equals y: true, y equals x: true x = List((buffers,20), (layers,2), (title,3)) y = List((buffers,20), (layers,2), (title,3)) x equals y: true, y equals x: true -x = ListMap(buffers -> 20, layers -> 2, title -> 3) -y = ListMap(buffers -> 20, layers -> 2, title -> 3) +x = Map(buffers -> 20, layers -> 2, title -> 3) +y = Map(buffers -> 20, layers -> 2, title -> 3) x equals y: true, y equals x: true x = ListSet(5, 3) @@ -109,8 +109,8 @@ x = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) y = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) x equals y: true, y equals x: true -x = TreeMap(1 -> A, 2 -> B, 3 -> C) -y = TreeMap(1 -> A, 2 -> B, 3 -> C) +x = Map(1 -> A, 2 -> B, 3 -> C) +y = Map(1 -> A, 2 -> B, 3 -> C) x equals y: true, y equals x: true x = TreeSet(1, 2, 3) @@ -125,8 +125,8 @@ x = Stream(0, ?) y = Stream(0, ?) x equals y: true, y equals x: true -x = TreeMap(42 -> FortyTwo) -y = TreeMap(42 -> FortyTwo) +x = Map(42 -> FortyTwo) +y = Map(42 -> FortyTwo) x equals y: true, y equals x: true x = TreeSet(0, 2) @@ -161,12 +161,12 @@ x = BitSet(0, 8, 9) y = BitSet(0, 8, 9) x equals y: true, y equals x: true -x = HashMap(C -> 3, B -> 2, A -> 1) -y = HashMap(C -> 3, A -> 1, B -> 2) +x = Map(C -> 3, B -> 2, A -> 1) +y = Map(C -> 3, A -> 1, B -> 2) x equals y: true, y equals x: true -x = HashSet(layers, title, buffers) -y = HashSet(layers, title, buffers) +x = Set(layers, title, buffers) +y = Set(layers, title, buffers) x equals y: true, y equals x: true x = History() diff --git a/test/files/run/bug1074.check b/test/files/run/bug1074.check index def79b6089..ccf1cb1551 100644 --- a/test/files/run/bug1074.check +++ b/test/files/run/bug1074.check @@ -1,3 +1,3 @@ -q0 = HashSet(kl, jk, cd, fg, ef, gh, a, de, hj, b, lm, mn) -q1 = HashSet() 0 -q2 = HashSet() 0 +q0 = Set(kl, jk, cd, fg, ef, gh, a, de, hj, b, lm, mn) +q1 = Set() 0 +q2 = Set() 0 -- cgit v1.2.3