diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-28 12:58:04 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-28 12:58:04 -0700 |
commit | bad1e8e6d7f513f37353c9f7f23dbde5f59cb038 (patch) | |
tree | 662ed324ab11f09581cb5c509403dd59b615d6a0 /test | |
parent | 0c1acec0a02b9128f3d138ecef84d903296d6b2a (diff) | |
parent | b379ff4f59c139ff7d2b77e7e808f0b74aa9f268 (diff) | |
download | scala-bad1e8e6d7f513f37353c9f7f23dbde5f59cb038.tar.gz scala-bad1e8e6d7f513f37353c9f7f23dbde5f59cb038.tar.bz2 scala-bad1e8e6d7f513f37353c9f7f23dbde5f59cb038.zip |
Merge pull request #796 from axel22/issue/5846,4597,4027,4112
Issue/5846,4597,4027,4112
Diffstat (limited to 'test')
-rw-r--r-- | test/files/pos/t5846.scala | 10 | ||||
-rw-r--r-- | test/files/run/t4027.check | 12 | ||||
-rw-r--r-- | test/files/run/t4027.scala | 27 |
3 files changed, 49 insertions, 0 deletions
diff --git a/test/files/pos/t5846.scala b/test/files/pos/t5846.scala new file mode 100644 index 0000000000..b06f5ac39c --- /dev/null +++ b/test/files/pos/t5846.scala @@ -0,0 +1,10 @@ + + + + +/** Return the most general sorted map type. */ +object Test extends App { + + val empty: collection.SortedMap[String, String] = collection.SortedMap.empty[String, String] + +} diff --git a/test/files/run/t4027.check b/test/files/run/t4027.check new file mode 100644 index 0000000000..bdacfc1c06 --- /dev/null +++ b/test/files/run/t4027.check @@ -0,0 +1,12 @@ +Map(2 -> true, 4 -> true) +Map(1 -> false!, 2 -> true!, 3 -> false!, 4 -> true!) +Map(2 -> 4, 4 -> 4) +Map(1 -> 6, 2 -> 5, 3 -> 6, 4 -> 5) +Map() +Map(1 -> false!) +Map(2 -> true, 4 -> true) +Map(1 -> false!, 2 -> true!, 3 -> false!, 4 -> true!) +Map(2 -> 4, 4 -> 4) +Map(1 -> 6, 2 -> 5, 3 -> 6, 4 -> 5) +Map() +Map(1 -> false!)
\ No newline at end of file diff --git a/test/files/run/t4027.scala b/test/files/run/t4027.scala new file mode 100644 index 0000000000..d70ca0cc3a --- /dev/null +++ b/test/files/run/t4027.scala @@ -0,0 +1,27 @@ + + +import collection._ + + +/** Sorted maps should have `filterKeys` and `mapValues` which return sorted maps. + * Mapping, filtering, etc. on these views should return sorted maps again. + */ +object Test extends App { + + val sortedmap = SortedMap(1 -> false, 2 -> true, 3 -> false, 4 -> true) + println(sortedmap.filterKeys(_ % 2 == 0): SortedMap[Int, Boolean]) + println(sortedmap.mapValues(_ + "!"): SortedMap[Int, String]) + println(sortedmap.filterKeys(_ % 2 == 0).map(t => (t._1, t._2.toString.length)): SortedMap[Int, Int]) + println(sortedmap.mapValues(_ + "!").map(t => (t._1, t._2.toString.length)): SortedMap[Int, Int]) + println(sortedmap.filterKeys(_ % 2 == 0).filter(t => t._1 < 2): SortedMap[Int, Boolean]) + println(sortedmap.mapValues(_ + "!").filter(t => t._1 < 2): SortedMap[Int, String]) + + val immsortedmap = immutable.SortedMap(1 -> false, 2 -> true, 3 -> false, 4 -> true) + println(immsortedmap.filterKeys(_ % 2 == 0): immutable.SortedMap[Int, Boolean]) + println(immsortedmap.mapValues(_ + "!"): immutable.SortedMap[Int, String]) + println(immsortedmap.filterKeys(_ % 2 == 0).map(t => (t._1, t._2.toString.length)): immutable.SortedMap[Int, Int]) + println(immsortedmap.mapValues(_ + "!").map(t => (t._1, t._2.toString.length)): immutable.SortedMap[Int, Int]) + println(immsortedmap.filterKeys(_ % 2 == 0).filter(t => t._1 < 2): immutable.SortedMap[Int, Boolean]) + println(immsortedmap.mapValues(_ + "!").filter(t => t._1 < 2): immutable.SortedMap[Int, String]) + +} |