diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-16 18:48:20 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-16 18:48:20 +0000 |
commit | 354e2abd2ed353349c533f025ec24adecbbac86f (patch) | |
tree | c58c5a52d2aa64476b75357fb9c310b259847ba3 /test/files | |
parent | 2e32d71a48ffcb4ff7f92b9c469dd88d5c8b4d8d (diff) | |
download | scala-354e2abd2ed353349c533f025ec24adecbbac86f.tar.gz scala-354e2abd2ed353349c533f025ec24adecbbac86f.tar.bz2 scala-354e2abd2ed353349c533f025ec24adecbbac86f.zip |
Merged revisions 22325 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22325 | cunei | 2010-06-16 20:46:28 +0200 (Wed, 16 Jun 2010) | 2 lines
first part of r22260
........
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/colltest1.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala index 943fe4c4e7..dd9ecdbd5e 100644 --- a/test/files/run/colltest1.scala +++ b/test/files/run/colltest1.scala @@ -29,8 +29,8 @@ object Test extends Application { val (o, e) = ten.partition(_ % 2 == 0) assert(o.size == e.size) val gs = ten groupBy (x => x / 4) - val vs1 = (for (k <- gs.keysIterator; v <- gs(k).toIterable.iterator) yield v).toList - val vs2 = gs.values.toList.flatten + val vs1 = (for (k <- gs.keysIterator; v <- gs(k).toIterable.iterator) yield v).toList.sorted + val vs2 = gs.values.toList.flatten.sorted // val vs2 = gs.values.toList flatMap (xs => xs) assert(ten.head == 1) assert(ten.tail.head == 2) |