diff options
author | Matthias Zenger <mzenger@gmail.com> | 2004-05-04 08:27:25 +0000 |
---|---|---|
committer | Matthias Zenger <mzenger@gmail.com> | 2004-05-04 08:27:25 +0000 |
commit | 7db35370fe2e2bf3ed3a9fa600af7804095506db (patch) | |
tree | 188454e6f81fc754653271d5293bc182c71f3f7b /test/files | |
parent | 927dadef1009442fda637bfe568616630dbec6d0 (diff) | |
download | scala-7db35370fe2e2bf3ed3a9fa600af7804095506db.tar.gz scala-7db35370fe2e2bf3ed3a9fa600af7804095506db.tar.bz2 scala-7db35370fe2e2bf3ed3a9fa600af7804095506db.zip |
*** empty log message ***
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/bugs.scala | 5 | ||||
-rw-r--r-- | test/files/run/map_test.scala | 48 |
2 files changed, 22 insertions, 31 deletions
diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala index 8a1f4fd839..3aa4784033 100644 --- a/test/files/run/bugs.scala +++ b/test/files/run/bugs.scala @@ -44,12 +44,9 @@ object Bug120Test { object Bug135Test { import scala.collection.immutable.TreeMap; - import scala.collection.immutable.Order; def main(args: Array[String]): Unit = { - val intOrder = - new Order((x:int,y:int) => x < y, (x:int,y:int) => x == y); - val myMap:TreeMap[int,String] = new TreeMap(intOrder); + val myMap:TreeMap[int,String] = new TreeMap; val map1 = myMap + 42 -> "The answer"; Console.println(map1.get(42)); } diff --git a/test/files/run/map_test.scala b/test/files/run/map_test.scala index 86430f10a9..4a7099e642 100644 --- a/test/files/run/map_test.scala +++ b/test/files/run/map_test.scala @@ -1,12 +1,8 @@ import scala.collection.immutable.Map; import scala.collection.immutable.TreeMap; import scala.collection.immutable.ListMap; -import scala.collection.immutable.Order; object Test with Application { - val intOrder = - Order.make((x:int,y:int) => x < y); - test1(); test2(); Console.println("OK"); @@ -14,35 +10,33 @@ object Test with Application { def test1() = { - val myMap:TreeMap[int,String] = new TreeMap(intOrder); + val myMap:TreeMap[int,String] = new TreeMap; test_map(myMap); } def test2() = { - val myMap:ListMap[int,String] = new ListMap; - test_map(myMap); + val myMap:ListMap[int,String] = new ListMap; + test_map(myMap); } def test_map(myMap:Map[int,String]) = { - val map1 = myMap.update(42,"The answer"); - val map2 = map1.update(17,"A small random number"); - val map3 = map2.update(666,"A bigger random number"); - val map4 = map3.update(4711,"A big random number"); - map1 == myMap + 42 -> "The answer"; - var i = 0; - var map = map4; - while(i < 43) { - map = map.update(i,i.toString()); - i = i + 1; - } - i = 0; - while(i < 4712) { - if(map.isDefinedAt(i)) - Console.print(i + "->" + map(i) + " "); - i = i + 1; - } - Console.println(""); + val map1 = myMap.update(42,"The answer"); + val map2 = map1.update(17,"A small random number"); + val map3 = map2.update(666,"A bigger random number"); + val map4 = map3.update(4711,"A big random number"); + map1 == myMap + 42 -> "The answer"; + var i = 0; + var map = map4; + while(i < 43) { + map = map.update(i,i.toString()); + i = i + 1; + } + i = 0; + while(i < 4712) { + if(map.isDefinedAt(i)) + Console.print(i + "->" + map(i) + " "); + i = i + 1; + } + Console.println(""); } } - - |