summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-12-19 14:27:09 +0000
committerMartin Odersky <odersky@gmail.com>2007-12-19 14:27:09 +0000
commit999d30eea73cc19ff1603fc57c13d937c4fc6ce2 (patch)
tree607f83d87a09062e0d581cc5e80ac5c1829279af /test/files
parent422a46993cdb74ccf3650e0b171f65c6c12bdedf (diff)
downloadscala-999d30eea73cc19ff1603fc57c13d937c4fc6ce2.tar.gz
scala-999d30eea73cc19ff1603fc57c13d937c4fc6ce2.tar.bz2
scala-999d30eea73cc19ff1603fc57c13d937c4fc6ce2.zip
fixed some tests for jvm-1.5
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/bug229.scala2
-rw-r--r--test/files/run/deeps.scala6
-rw-r--r--test/files/run/streams.check4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/files/pos/bug229.scala b/test/files/pos/bug229.scala
index 2bceea0782..0922499c6c 100644
--- a/test/files/pos/bug229.scala
+++ b/test/files/pos/bug229.scala
@@ -1,3 +1,3 @@
-class Test extends java.util.ArrayList {
+class Test extends java.util.ArrayList[Object] {
override def add(index: int, element: java.lang.Object): unit = {}
}
diff --git a/test/files/run/deeps.scala b/test/files/run/deeps.scala
index af35ce6e45..e592c4ea25 100644
--- a/test/files/run/deeps.scala
+++ b/test/files/run/deeps.scala
@@ -46,8 +46,8 @@ object Test extends Application {
println("boo:and:foo".split(':') equals "boo:and:foo".split(':'))
println("boo:and:foo".split(':') deepEquals "boo:and:foo".split(':'))
- val xs = new java.util.ArrayList(); xs.add("a")
- val ys = new java.util.ArrayList(); ys.add("a")
+ val xs = new java.util.ArrayList[String](); xs.add("a")
+ val ys = new java.util.ArrayList[String](); ys.add("a")
println(xs.toArray == ys.toArray)
println(xs.toArray equals ys.toArray)
println(xs.toArray deepEquals ys.toArray)
@@ -98,7 +98,7 @@ object Test extends Application {
def testToString3 {
println("boo:and:foo".split(':').deepToString)
- val xs = new java.util.ArrayList(); xs.add("a")
+ val xs = new java.util.ArrayList[String](); xs.add("a")
println(xs.toArray.deepToString)
}
diff --git a/test/files/run/streams.check b/test/files/run/streams.check
index 180217df4a..5346c73d12 100644
--- a/test/files/run/streams.check
+++ b/test/files/run/streams.check
@@ -15,5 +15,5 @@ Stream()
Stream(1, 2)
Stream()
-9999
-8192
+999
+512