summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-09-28 12:15:42 +0000
committerMartin Odersky <odersky@gmail.com>2009-09-28 12:15:42 +0000
commit4231751ecf81819f9e973df817c884158014fa51 (patch)
tree8bac8cae714f6b7dd0076165bf5a6be1ce7a2d23 /test/files
parent53d98e7d421d55054fb0bcb606539fc36364bebf (diff)
downloadscala-4231751ecf81819f9e973df817c884158014fa51.tar.gz
scala-4231751ecf81819f9e973df817c884158014fa51.tar.bz2
scala-4231751ecf81819f9e973df817c884158014fa51.zip
fixed up tests
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/implicits.check7
-rw-r--r--test/files/run/arrays.scala2
-rw-r--r--test/files/run/colltest1.scala4
3 files changed, 9 insertions, 4 deletions
diff --git a/test/files/neg/implicits.check b/test/files/neg/implicits.check
index e7ef03b387..d94e1f27f2 100644
--- a/test/files/neg/implicits.check
+++ b/test/files/neg/implicits.check
@@ -12,4 +12,9 @@ implicits.scala:38: error: type mismatch;
required: Int
foo(set)
^
-two errors found
+implicits.scala:46: error: type mismatch;
+ found : List[Any]
+ required: scala.List[Mxml]
+ children.toList.flatMap ( e => {
+ ^
+three errors found
diff --git a/test/files/run/arrays.scala b/test/files/run/arrays.scala
index e8a984dc1b..cd1cf13793 100644
--- a/test/files/run/arrays.scala
+++ b/test/files/run/arrays.scala
@@ -161,7 +161,7 @@ object Test {
def checkT2368() {
val arr = Array(1, 2, 3)
arr(0) += 1
- assert(arr(0) == 1)
+ assert(arr(0) == 2)
}
//##########################################################################
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index 7069c052a5..ea8ff8e305 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -127,8 +127,8 @@ object Test extends Application {
assert(ten.patch(0, List(1, 2, 3), 9) == List(1, 2, 3, 10))
assert(empty.padTo(10, 7) == Array.fill(10)(7).toSequence)
assert((ten zip ten.indices) == ten.zipWithIndex)
- assert(ten sortWith (_ < _) == ten)
- assert(ten sortWith (_ > _) == ten.reverse)
+ assert(ten.sortWith(_ < _) == ten)
+ assert(ten.sortWith(_ > _) == ten.reverse)
}
def setTest(empty: => Set[String]) {