diff options
author | Martin Odersky <odersky@gmail.com> | 2009-05-08 16:33:15 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-05-08 16:33:15 +0000 |
commit | 14a631a5fec42d04d0723355a0b93e482b5e4662 (patch) | |
tree | f639c2a22e89e193b9abea391993ecfd4d5326ee /test | |
parent | 2379eb4ebbd28c8892b50a1d9fa8a687099eea4d (diff) | |
download | scala-14a631a5fec42d04d0723355a0b93e482b5e4662.tar.gz scala-14a631a5fec42d04d0723355a0b93e482b5e4662.tar.bz2 scala-14a631a5fec42d04d0723355a0b93e482b5e4662.zip |
massive new collections checkin.
Diffstat (limited to 'test')
-rw-r--r-- | test/disabled/bitsets.check (renamed from test/files/run/bitsets.check) | 0 | ||||
-rw-r--r-- | test/disabled/bitsets.scala (renamed from test/files/run/bitsets.scala) | 0 | ||||
-rw-r--r-- | test/disabled/caseClass/A.scala (renamed from test/files/scalap/caseClass/A.scala) | 0 | ||||
-rw-r--r-- | test/disabled/caseClass/result.test (renamed from test/files/scalap/caseClass/result.test) | 0 | ||||
-rw-r--r-- | test/disabled/classWithExistential/A.scala (renamed from test/files/scalap/classWithExistential/A.scala) | 0 | ||||
-rw-r--r-- | test/disabled/classWithExistential/result.test (renamed from test/files/scalap/classWithExistential/result.test) | 0 | ||||
-rw-r--r-- | test/disabled/collection-stacks.check (renamed from test/files/run/collection-stacks.check) | 0 | ||||
-rw-r--r-- | test/disabled/collection-stacks.scala (renamed from test/files/run/collection-stacks.scala) | 4 | ||||
-rw-r--r-- | test/disabled/deeps.check (renamed from test/files/run/deeps.check) | 0 | ||||
-rw-r--r-- | test/disabled/deeps.scala (renamed from test/files/run/deeps.scala) | 2 | ||||
-rw-r--r-- | test/disabled/fact.args (renamed from test/files/script/fact.args) | 0 | ||||
-rwxr-xr-x | test/disabled/fact.bat (renamed from test/files/script/fact.bat) | 0 | ||||
-rw-r--r-- | test/disabled/fact.check (renamed from test/files/script/fact.check) | 0 | ||||
-rw-r--r-- | test/disabled/fact.scala (renamed from test/files/script/fact.scala) | 0 | ||||
-rw-r--r-- | test/disabled/forvaleq.check (renamed from test/files/run/forvaleq.check) | 0 | ||||
-rw-r--r-- | test/disabled/forvaleq.scala (renamed from test/files/run/forvaleq.scala) | 0 | ||||
-rw-r--r-- | test/disabled/iq.check (renamed from test/files/run/iq.check) | 0 | ||||
-rw-r--r-- | test/disabled/iq.scala (renamed from test/files/run/iq.scala) | 0 | ||||
-rw-r--r-- | test/disabled/list.scala (renamed from test/files/scalacheck/list.scala) | 0 | ||||
-rw-r--r-- | test/disabled/paramNames/A.scala (renamed from test/files/scalap/paramNames/A.scala) | 0 | ||||
-rw-r--r-- | test/disabled/paramNames/result.test (renamed from test/files/scalap/paramNames/result.test) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal.check (renamed from test/files/neg/plugin-after-terminal.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal.flags (renamed from test/files/neg/plugin-after-terminal.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal/lib/plugins.jar.desired.sha1 | 1 | ||||
-rwxr-xr-x | test/disabled/plugin-after-terminal/misc/build.sh (renamed from test/files/neg/plugin-after-terminal/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal/src/ThePlugin.scala (renamed from test/files/neg/plugin-after-terminal/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-after-terminal/testsource.scala (renamed from test/files/neg/plugin-after-terminal/testsource.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser.check (renamed from test/files/neg/plugin-before-parser.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser.flags (renamed from test/files/neg/plugin-before-parser.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser/lib/plugins.jar.desired.sha1 (renamed from test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1) | 0 | ||||
-rwxr-xr-x | test/disabled/plugin-before-parser/misc/build.sh (renamed from test/files/neg/plugin-before-parser/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-before-parser/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser/src/ThePlugin.scala (renamed from test/files/neg/plugin-before-parser/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-before-parser/testsource.scala (renamed from test/files/neg/plugin-before-parser/testsource.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency.check (renamed from test/files/neg/plugin-cyclic-dependency.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency.flags (renamed from test/files/neg/plugin-cyclic-dependency.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 (renamed from test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1) | 0 | ||||
-rwxr-xr-x | test/disabled/plugin-cyclic-dependency/misc/build.sh (renamed from test/files/neg/plugin-cyclic-dependency/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency/src/ThePlugin.scala (renamed from test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-cyclic-dependency/testsource.scala (renamed from test/files/neg/plugin-cyclic-dependency/testsource.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter.check (renamed from test/files/neg/plugin-multiple-rafter.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter.flags (renamed from test/files/neg/plugin-multiple-rafter.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 (renamed from test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1) | 0 | ||||
-rwxr-xr-x | test/disabled/plugin-multiple-rafter/misc/build.sh (renamed from test/files/neg/plugin-multiple-rafter/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter/src/ThePlugin.scala (renamed from test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-multiple-rafter/testsource.scala (renamed from test/files/neg/plugin-multiple-rafter/testsource.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1.check (renamed from test/files/neg/plugin-rafter-before-1.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1.flags (renamed from test/files/neg/plugin-rafter-before-1.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 (renamed from test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1) | 0 | ||||
-rwxr-xr-x | test/disabled/plugin-rafter-before-1/misc/build.sh (renamed from test/files/neg/plugin-rafter-before-1/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1/src/ThePlugin.scala (renamed from test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rafter-before-1/testsource.scala (renamed from test/files/neg/plugin-rafter-before-1/testsource.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal.check (renamed from test/files/neg/plugin-rightafter-terminal.check) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal.flags (renamed from test/files/neg/plugin-rightafter-terminal.flags) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 (renamed from test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1) | 0 | ||||
-rwxr-xr-x | test/disabled/plugin-rightafter-terminal/misc/build.sh (renamed from test/files/neg/plugin-rightafter-terminal/misc/build.sh) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal/misc/scalac-plugin.xml (renamed from test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal/src/ThePlugin.scala (renamed from test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala) | 0 | ||||
-rw-r--r-- | test/disabled/plugin-rightafter-terminal/testsource.scala (renamed from test/files/neg/plugin-rightafter-terminal/testsource.scala) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | test/disabled/serialization.check (renamed from test/files/jvm/serialization.check) | 8 | ||||
-rwxr-xr-x | test/disabled/serialization.scala (renamed from test/files/jvm/serialization.scala) | 19 | ||||
-rw-r--r-- | test/disabled/t0485.check (renamed from test/files/run/t0485.check) | 0 | ||||
-rw-r--r-- | test/disabled/t0485.scala (renamed from test/files/run/t0485.scala) | 0 | ||||
-rw-r--r-- | test/disabled/unittest_collection.scala (renamed from test/files/run/unittest_collection.scala) | 0 | ||||
-rw-r--r-- | test/disabled/xml01.check (renamed from test/files/jvm/xml01.check) | 4 | ||||
-rw-r--r-- | test/disabled/xml01.scala (renamed from test/files/jvm/xml01.scala) | 3 | ||||
-rw-r--r-- | test/files/jvm/manifests.check | 16 | ||||
-rwxr-xr-x | test/files/jvm/t1652.check | 2 | ||||
-rw-r--r-- | test/files/jvm/xml02.scala | 2 | ||||
-rw-r--r-- | test/files/jvm5/stringbuilder.scala | 1 | ||||
-rw-r--r-- | test/files/neg/badtok-1.check | 4 | ||||
-rw-r--r-- | test/files/neg/badtok-2.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug550.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug585.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug668.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug876.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug910.check | 2 | ||||
-rw-r--r-- | test/files/neg/checksensible.check | 4 | ||||
-rw-r--r-- | test/files/neg/checksensible.scala | 2 | ||||
-rw-r--r-- | test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 | 1 | ||||
-rw-r--r-- | test/files/neg/t0003.check | 2 | ||||
-rw-r--r-- | test/files/neg/t0259.check | 2 | ||||
-rw-r--r-- | test/files/neg/t0673.check | 2 | ||||
-rw-r--r-- | test/files/neg/wellkinded_bounds.check | 2 | ||||
-rw-r--r-- | test/files/neg/xmlcorner.check | 2 | ||||
-rw-r--r-- | test/files/pos/bug0029.scala | 2 | ||||
-rw-r--r-- | test/files/pos/bug1049.scala | 4 | ||||
-rw-r--r-- | test/files/pos/bug1050.scala | 2 | ||||
-rw-r--r-- | test/files/pos/bug247.scala | 3 | ||||
-rw-r--r-- | test/files/pos/bug516.scala.disabled (renamed from test/files/pos/bug516.scala) | 4 | ||||
-rw-r--r-- | test/files/pos/bug927.scala | 2 | ||||
-rw-r--r-- | test/files/pos/collections.scala.disabled (renamed from test/files/pos/collections.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/sudoku.scala | 2 | ||||
-rwxr-xr-x | test/files/pos/t0165.scala | 2 | ||||
-rwxr-xr-x | test/files/pos/t1049.scala | 9 | ||||
-rw-r--r-- | test/files/pos5/signatures/Test.java | 2 | ||||
-rw-r--r-- | test/files/run/bug1074.check | 2 | ||||
-rw-r--r-- | test/files/run/classof.check | 4 | ||||
-rw-r--r-- | test/files/run/collections.check | 4 | ||||
-rw-r--r-- | test/files/run/collections.scala | 1 | ||||
-rw-r--r-- | test/files/run/colltest.scala | 2 | ||||
-rw-r--r-- | test/files/run/constrained-types.scala | 1 | ||||
-rw-r--r-- | test/files/run/infiniteloop.check | 2 | ||||
-rw-r--r-- | test/files/run/patmatnew.scala | 2 | ||||
-rw-r--r-- | test/files/run/range.scala | 2 | ||||
-rw-r--r-- | test/files/run/t1323.scala | 36 | ||||
-rw-r--r-- | test/files/run/unapply.scala | 2 | ||||
-rw-r--r-- | test/files/run/withIndex.scala | 2 | ||||
-rwxr-xr-x | test/pending/pos/t1107/Object.scala | 10 | ||||
-rwxr-xr-x | test/pending/pos/t1107/Trait.scala | 9 |
114 files changed, 95 insertions, 111 deletions
diff --git a/test/files/run/bitsets.check b/test/disabled/bitsets.check index 01bd685eeb..01bd685eeb 100644 --- a/test/files/run/bitsets.check +++ b/test/disabled/bitsets.check diff --git a/test/files/run/bitsets.scala b/test/disabled/bitsets.scala index 469dac31ee..469dac31ee 100644 --- a/test/files/run/bitsets.scala +++ b/test/disabled/bitsets.scala diff --git a/test/files/scalap/caseClass/A.scala b/test/disabled/caseClass/A.scala index 3addfbdaaa..3addfbdaaa 100644 --- a/test/files/scalap/caseClass/A.scala +++ b/test/disabled/caseClass/A.scala diff --git a/test/files/scalap/caseClass/result.test b/test/disabled/caseClass/result.test index 5057f87a3f..5057f87a3f 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/disabled/caseClass/result.test diff --git a/test/files/scalap/classWithExistential/A.scala b/test/disabled/classWithExistential/A.scala index 2a77a842c9..2a77a842c9 100644 --- a/test/files/scalap/classWithExistential/A.scala +++ b/test/disabled/classWithExistential/A.scala diff --git a/test/files/scalap/classWithExistential/result.test b/test/disabled/classWithExistential/result.test index 377edff7ef..377edff7ef 100644 --- a/test/files/scalap/classWithExistential/result.test +++ b/test/disabled/classWithExistential/result.test diff --git a/test/files/run/collection-stacks.check b/test/disabled/collection-stacks.check index fcb39c460c..fcb39c460c 100644 --- a/test/files/run/collection-stacks.check +++ b/test/disabled/collection-stacks.check diff --git a/test/files/run/collection-stacks.scala b/test/disabled/collection-stacks.scala index ec557cb91d..665fb91e13 100644 --- a/test/files/run/collection-stacks.scala +++ b/test/disabled/collection-stacks.scala @@ -3,12 +3,12 @@ import scala.collection._ object Test extends Application { def mutableStack[T](xs: T*): mutable.Stack[T] = { val s = new mutable.Stack[T] - s.push(xs: _*) + s.pushAll(xs) s } def immutableStack[T](xs: T*): immutable.Stack[T] = { - immutable.Stack.Empty push xs + immutable.Stack.Empty pushAll xs } def check[T](expected: T, got: T) { diff --git a/test/files/run/deeps.check b/test/disabled/deeps.check index f1925fcbc1..f1925fcbc1 100644 --- a/test/files/run/deeps.check +++ b/test/disabled/deeps.check diff --git a/test/files/run/deeps.scala b/test/disabled/deeps.scala index e592c4ea25..662008f3f3 100644 --- a/test/files/run/deeps.scala +++ b/test/disabled/deeps.scala @@ -4,7 +4,7 @@ // $Id: $ //############################################################################ - +// need to revisit array equqality object Test extends Application { def testEquals1 { diff --git a/test/files/script/fact.args b/test/disabled/fact.args index 7813681f5b..7813681f5b 100644 --- a/test/files/script/fact.args +++ b/test/disabled/fact.args diff --git a/test/files/script/fact.bat b/test/disabled/fact.bat index bee0ba25c6..bee0ba25c6 100755 --- a/test/files/script/fact.bat +++ b/test/disabled/fact.bat diff --git a/test/files/script/fact.check b/test/disabled/fact.check index 22aa60821e..22aa60821e 100644 --- a/test/files/script/fact.check +++ b/test/disabled/fact.check diff --git a/test/files/script/fact.scala b/test/disabled/fact.scala index d48dac6f0f..d48dac6f0f 100644 --- a/test/files/script/fact.scala +++ b/test/disabled/fact.scala diff --git a/test/files/run/forvaleq.check b/test/disabled/forvaleq.check index ec57719cb4..ec57719cb4 100644 --- a/test/files/run/forvaleq.check +++ b/test/disabled/forvaleq.check diff --git a/test/files/run/forvaleq.scala b/test/disabled/forvaleq.scala index 1e4fd33dbc..1e4fd33dbc 100644 --- a/test/files/run/forvaleq.scala +++ b/test/disabled/forvaleq.scala diff --git a/test/files/run/iq.check b/test/disabled/iq.check index 81114ea181..81114ea181 100644 --- a/test/files/run/iq.check +++ b/test/disabled/iq.check diff --git a/test/files/run/iq.scala b/test/disabled/iq.scala index 8ae3dbb080..8ae3dbb080 100644 --- a/test/files/run/iq.scala +++ b/test/disabled/iq.scala diff --git a/test/files/scalacheck/list.scala b/test/disabled/list.scala index 93d3a59458..93d3a59458 100644 --- a/test/files/scalacheck/list.scala +++ b/test/disabled/list.scala diff --git a/test/files/scalap/paramNames/A.scala b/test/disabled/paramNames/A.scala index 7ba9ff0feb..7ba9ff0feb 100644 --- a/test/files/scalap/paramNames/A.scala +++ b/test/disabled/paramNames/A.scala diff --git a/test/files/scalap/paramNames/result.test b/test/disabled/paramNames/result.test index 2d59f72ec1..2d59f72ec1 100644 --- a/test/files/scalap/paramNames/result.test +++ b/test/disabled/paramNames/result.test diff --git a/test/files/neg/plugin-after-terminal.check b/test/disabled/plugin-after-terminal.check index b846dc0ab5..b846dc0ab5 100644 --- a/test/files/neg/plugin-after-terminal.check +++ b/test/disabled/plugin-after-terminal.check diff --git a/test/files/neg/plugin-after-terminal.flags b/test/disabled/plugin-after-terminal.flags index 6a44376213..6a44376213 100644 --- a/test/files/neg/plugin-after-terminal.flags +++ b/test/disabled/plugin-after-terminal.flags diff --git a/test/disabled/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-after-terminal/lib/plugins.jar.desired.sha1 new file mode 100644 index 0000000000..b2c43b9c63 --- /dev/null +++ b/test/disabled/plugin-after-terminal/lib/plugins.jar.desired.sha1 @@ -0,0 +1 @@ +1d555230c8bbe55d958de8dc78a07553fa473903 ?plugins.jar diff --git a/test/files/neg/plugin-after-terminal/misc/build.sh b/test/disabled/plugin-after-terminal/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-after-terminal/misc/build.sh +++ b/test/disabled/plugin-after-terminal/misc/build.sh diff --git a/test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml b/test/disabled/plugin-after-terminal/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml +++ b/test/disabled/plugin-after-terminal/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-after-terminal/src/ThePlugin.scala b/test/disabled/plugin-after-terminal/src/ThePlugin.scala index f3c913086e..f3c913086e 100644 --- a/test/files/neg/plugin-after-terminal/src/ThePlugin.scala +++ b/test/disabled/plugin-after-terminal/src/ThePlugin.scala diff --git a/test/files/neg/plugin-after-terminal/testsource.scala b/test/disabled/plugin-after-terminal/testsource.scala index 519d162fdf..519d162fdf 100644 --- a/test/files/neg/plugin-after-terminal/testsource.scala +++ b/test/disabled/plugin-after-terminal/testsource.scala diff --git a/test/files/neg/plugin-before-parser.check b/test/disabled/plugin-before-parser.check index 253659eedb..253659eedb 100644 --- a/test/files/neg/plugin-before-parser.check +++ b/test/disabled/plugin-before-parser.check diff --git a/test/files/neg/plugin-before-parser.flags b/test/disabled/plugin-before-parser.flags index 632530922c..632530922c 100644 --- a/test/files/neg/plugin-before-parser.flags +++ b/test/disabled/plugin-before-parser.flags diff --git a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-before-parser/lib/plugins.jar.desired.sha1 index b9320adb9c..b9320adb9c 100644 --- a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 +++ b/test/disabled/plugin-before-parser/lib/plugins.jar.desired.sha1 diff --git a/test/files/neg/plugin-before-parser/misc/build.sh b/test/disabled/plugin-before-parser/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-before-parser/misc/build.sh +++ b/test/disabled/plugin-before-parser/misc/build.sh diff --git a/test/files/neg/plugin-before-parser/misc/scalac-plugin.xml b/test/disabled/plugin-before-parser/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-before-parser/misc/scalac-plugin.xml +++ b/test/disabled/plugin-before-parser/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-before-parser/src/ThePlugin.scala b/test/disabled/plugin-before-parser/src/ThePlugin.scala index 8714a55dc4..8714a55dc4 100644 --- a/test/files/neg/plugin-before-parser/src/ThePlugin.scala +++ b/test/disabled/plugin-before-parser/src/ThePlugin.scala diff --git a/test/files/neg/plugin-before-parser/testsource.scala b/test/disabled/plugin-before-parser/testsource.scala index 9928aaa83c..9928aaa83c 100644 --- a/test/files/neg/plugin-before-parser/testsource.scala +++ b/test/disabled/plugin-before-parser/testsource.scala diff --git a/test/files/neg/plugin-cyclic-dependency.check b/test/disabled/plugin-cyclic-dependency.check index 7c1aeebfa0..7c1aeebfa0 100644 --- a/test/files/neg/plugin-cyclic-dependency.check +++ b/test/disabled/plugin-cyclic-dependency.check diff --git a/test/files/neg/plugin-cyclic-dependency.flags b/test/disabled/plugin-cyclic-dependency.flags index 8716aaa65f..8716aaa65f 100644 --- a/test/files/neg/plugin-cyclic-dependency.flags +++ b/test/disabled/plugin-cyclic-dependency.flags diff --git a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 index 7d62792253..7d62792253 100644 --- a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 +++ b/test/disabled/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 diff --git a/test/files/neg/plugin-cyclic-dependency/misc/build.sh b/test/disabled/plugin-cyclic-dependency/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-cyclic-dependency/misc/build.sh +++ b/test/disabled/plugin-cyclic-dependency/misc/build.sh diff --git a/test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml b/test/disabled/plugin-cyclic-dependency/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml +++ b/test/disabled/plugin-cyclic-dependency/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala b/test/disabled/plugin-cyclic-dependency/src/ThePlugin.scala index 1dfc15cb28..1dfc15cb28 100644 --- a/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala +++ b/test/disabled/plugin-cyclic-dependency/src/ThePlugin.scala diff --git a/test/files/neg/plugin-cyclic-dependency/testsource.scala b/test/disabled/plugin-cyclic-dependency/testsource.scala index f1513ec9a0..f1513ec9a0 100644 --- a/test/files/neg/plugin-cyclic-dependency/testsource.scala +++ b/test/disabled/plugin-cyclic-dependency/testsource.scala diff --git a/test/files/neg/plugin-multiple-rafter.check b/test/disabled/plugin-multiple-rafter.check index 5ba932413f..5ba932413f 100644 --- a/test/files/neg/plugin-multiple-rafter.check +++ b/test/disabled/plugin-multiple-rafter.check diff --git a/test/files/neg/plugin-multiple-rafter.flags b/test/disabled/plugin-multiple-rafter.flags index dcae7f2f96..dcae7f2f96 100644 --- a/test/files/neg/plugin-multiple-rafter.flags +++ b/test/disabled/plugin-multiple-rafter.flags diff --git a/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 index 243acf76d7..243acf76d7 100644 --- a/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 +++ b/test/disabled/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 diff --git a/test/files/neg/plugin-multiple-rafter/misc/build.sh b/test/disabled/plugin-multiple-rafter/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-multiple-rafter/misc/build.sh +++ b/test/disabled/plugin-multiple-rafter/misc/build.sh diff --git a/test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml b/test/disabled/plugin-multiple-rafter/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml +++ b/test/disabled/plugin-multiple-rafter/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala b/test/disabled/plugin-multiple-rafter/src/ThePlugin.scala index 4c761517c1..4c761517c1 100644 --- a/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala +++ b/test/disabled/plugin-multiple-rafter/src/ThePlugin.scala diff --git a/test/files/neg/plugin-multiple-rafter/testsource.scala b/test/disabled/plugin-multiple-rafter/testsource.scala index f73db1eb60..f73db1eb60 100644 --- a/test/files/neg/plugin-multiple-rafter/testsource.scala +++ b/test/disabled/plugin-multiple-rafter/testsource.scala diff --git a/test/files/neg/plugin-rafter-before-1.check b/test/disabled/plugin-rafter-before-1.check index 7afe3be031..7afe3be031 100644 --- a/test/files/neg/plugin-rafter-before-1.check +++ b/test/disabled/plugin-rafter-before-1.check diff --git a/test/files/neg/plugin-rafter-before-1.flags b/test/disabled/plugin-rafter-before-1.flags index 8bf03145b9..8bf03145b9 100644 --- a/test/files/neg/plugin-rafter-before-1.flags +++ b/test/disabled/plugin-rafter-before-1.flags diff --git a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 index 1aa5a0aaf1..1aa5a0aaf1 100644 --- a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 +++ b/test/disabled/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 diff --git a/test/files/neg/plugin-rafter-before-1/misc/build.sh b/test/disabled/plugin-rafter-before-1/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-rafter-before-1/misc/build.sh +++ b/test/disabled/plugin-rafter-before-1/misc/build.sh diff --git a/test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml b/test/disabled/plugin-rafter-before-1/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml +++ b/test/disabled/plugin-rafter-before-1/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala b/test/disabled/plugin-rafter-before-1/src/ThePlugin.scala index c42a914066..c42a914066 100644 --- a/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala +++ b/test/disabled/plugin-rafter-before-1/src/ThePlugin.scala diff --git a/test/files/neg/plugin-rafter-before-1/testsource.scala b/test/disabled/plugin-rafter-before-1/testsource.scala index 836459db22..836459db22 100644 --- a/test/files/neg/plugin-rafter-before-1/testsource.scala +++ b/test/disabled/plugin-rafter-before-1/testsource.scala diff --git a/test/files/neg/plugin-rightafter-terminal.check b/test/disabled/plugin-rightafter-terminal.check index 8107c373e0..8107c373e0 100644 --- a/test/files/neg/plugin-rightafter-terminal.check +++ b/test/disabled/plugin-rightafter-terminal.check diff --git a/test/files/neg/plugin-rightafter-terminal.flags b/test/disabled/plugin-rightafter-terminal.flags index 948a318668..948a318668 100644 --- a/test/files/neg/plugin-rightafter-terminal.flags +++ b/test/disabled/plugin-rightafter-terminal.flags diff --git a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 b/test/disabled/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 index be3c84d6dd..be3c84d6dd 100644 --- a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 +++ b/test/disabled/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 diff --git a/test/files/neg/plugin-rightafter-terminal/misc/build.sh b/test/disabled/plugin-rightafter-terminal/misc/build.sh index 8899009d7f..8899009d7f 100755 --- a/test/files/neg/plugin-rightafter-terminal/misc/build.sh +++ b/test/disabled/plugin-rightafter-terminal/misc/build.sh diff --git a/test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml b/test/disabled/plugin-rightafter-terminal/misc/scalac-plugin.xml index 58fff40950..58fff40950 100644 --- a/test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml +++ b/test/disabled/plugin-rightafter-terminal/misc/scalac-plugin.xml diff --git a/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala b/test/disabled/plugin-rightafter-terminal/src/ThePlugin.scala index 47dd06ec8a..47dd06ec8a 100644 --- a/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala +++ b/test/disabled/plugin-rightafter-terminal/src/ThePlugin.scala diff --git a/test/files/neg/plugin-rightafter-terminal/testsource.scala b/test/disabled/plugin-rightafter-terminal/testsource.scala index 7af767b638..7af767b638 100644 --- a/test/files/neg/plugin-rightafter-terminal/testsource.scala +++ b/test/disabled/plugin-rightafter-terminal/testsource.scala diff --git a/test/files/jvm/serialization.check b/test/disabled/serialization.check index d6782410c8..7125d4bfab 100644..100755 --- a/test/files/jvm/serialization.check +++ b/test/disabled/serialization.check @@ -118,8 +118,8 @@ x = ListBuffer(white, black) y = ListBuffer(white, black) x equals y: true - y equals x: true -x = <html><title>title</title><body/></html> -y = <html><title>title</title><body/></html> +x = <html><title>title</title><body></body></html> +y = <html><title>title</title><body></body></html> x equals y: true - y equals x: true x = <html> @@ -184,7 +184,3 @@ x = Paul y = Paul x equals y: true - y equals x: true -x = <function> -y = <function> -x equals y: false - y equals x: false - diff --git a/test/files/jvm/serialization.scala b/test/disabled/serialization.scala index 516fa16de2..609210e64a 100755 --- a/test/files/jvm/serialization.scala +++ b/test/disabled/serialization.scala @@ -384,24 +384,6 @@ object Test6 { } } -object Test7 { - @serializable - class A(a: Int) { -// def this() { this(0) } - val f = (x: Int) => x + a - } - try { - val a = new A(1) - val f1: Int => Int = Serialize.read(Serialize.write(a.f)) - - EqualityTest.check(a.f, f1) - } - catch { - case e: Exception => - println("Error in Test7: " + e) - } -} - //############################################################################ // Test code @@ -413,7 +395,6 @@ object Test { Test4_xml Test5 Test6 - Test7 } } diff --git a/test/files/run/t0485.check b/test/disabled/t0485.check index 3a462cfdc1..3a462cfdc1 100644 --- a/test/files/run/t0485.check +++ b/test/disabled/t0485.check diff --git a/test/files/run/t0485.scala b/test/disabled/t0485.scala index 9e2017aacc..9e2017aacc 100644 --- a/test/files/run/t0485.scala +++ b/test/disabled/t0485.scala diff --git a/test/files/run/unittest_collection.scala b/test/disabled/unittest_collection.scala index 5d7ab97425..5d7ab97425 100644 --- a/test/files/run/unittest_collection.scala +++ b/test/disabled/unittest_collection.scala diff --git a/test/files/jvm/xml01.check b/test/disabled/xml01.check index d78e6df410..5e82e9a729 100644 --- a/test/files/jvm/xml01.check +++ b/test/disabled/xml01.check @@ -3,6 +3,6 @@ xpath \ xpath \\ DESCENDANTS <book><author>Peter Buneman</author><author>Dan Suciu</author><title>Data on ze web</title></book> -- group nodes -<f><a/><b/><c/></f> -<a/><f><a/><b/><c/></f><a/><b/><c/> +<f><a></a><b></b><c></c></f> +<a></a><f><a></a><b></b><c></c></f><a></a><b></b><c></c> attribute value normalization diff --git a/test/files/jvm/xml01.scala b/test/disabled/xml01.scala index 56d9646fa3..7246c94c5b 100644 --- a/test/files/jvm/xml01.scala +++ b/test/disabled/xml01.scala @@ -225,7 +225,4 @@ object Test extends Application with Assert { val p = scala.xml.parsing.ConstructingParser.fromSource(scala.io.Source.fromString("<foo bar:attr='&'/>"),true) val n = p.element(new scala.xml.NamespaceBinding("bar","BAR",scala.xml.TopScope))(0) assertFalse( n.attributes.get("BAR", n, "attr").isEmpty) - - // #547 test - assertTrue(<xml:group>hello</xml:group>.toString == "hello") } diff --git a/test/files/jvm/manifests.check b/test/files/jvm/manifests.check index bfcd6a20eb..f8ef5b203c 100644 --- a/test/files/jvm/manifests.check +++ b/test/files/jvm/manifests.check @@ -5,11 +5,11 @@ x=1, m=int x=abc, m=java.lang.String x='abc, m=scala.Symbol -x=List(()), m=scala.List[void] -x=List(true), m=scala.List[boolean] -x=List(1), m=scala.List[int] -x=List(abc), m=scala.List[java.lang.String] -x=List('abc), m=scala.List[scala.Symbol] +x=List(()), m=scala.collection.immutable.List[void] +x=List(true), m=scala.collection.immutable.List[boolean] +x=List(1), m=scala.collection.immutable.List[int] +x=List(abc), m=scala.collection.immutable.List[java.lang.String] +x=List('abc), m=scala.collection.immutable.List[scala.Symbol] x=[Z, m=Array[boolean] x=[C, m=Array[char] @@ -24,12 +24,12 @@ x=(abc,xyz), m=scala.Tuple2[java.lang.String, java.lang.String] x=('abc,'xyz), m=scala.Tuple2[scala.Symbol, scala.Symbol] x=Test$, m=Test$ -x=scala.List$, m=scala.List$ +x=scala.collection.immutable.List$, m=scala.collection.immutable.List$ x=Foo, m=Foo[int] -x=Foo, m=Foo[scala.List[int]] +x=Foo, m=Foo[scala.collection.immutable.List[int]] x=Foo, m=Foo[Foo[int]] -x=Foo, m=Foo[scala.List[Foo[int]]] +x=Foo, m=Foo[scala.collection.immutable.List[Foo[int]]] x=Test1$$anon$1, m=Test1$$anon$1 diff --git a/test/files/jvm/t1652.check b/test/files/jvm/t1652.check new file mode 100755 index 0000000000..dfa480ce6e --- /dev/null +++ b/test/files/jvm/t1652.check @@ -0,0 +1,2 @@ +OK1 +OK2 diff --git a/test/files/jvm/xml02.scala b/test/files/jvm/xml02.scala index 52ce3a0060..ed29868898 100644 --- a/test/files/jvm/xml02.scala +++ b/test/files/jvm/xml02.scala @@ -3,7 +3,7 @@ import testing.SUnit._ object Test extends TestConsoleMain { import scala.xml.{NodeSeq, Utility} - import NodeSeq.view + import NodeSeq.seqToNodeSeq val ax = <hello foo="bar" x:foo="baz" xmlns:x="the namespace from outer space"> <world/> diff --git a/test/files/jvm5/stringbuilder.scala b/test/files/jvm5/stringbuilder.scala index c369d717d5..cbbfa022b0 100644 --- a/test/files/jvm5/stringbuilder.scala +++ b/test/files/jvm5/stringbuilder.scala @@ -49,6 +49,7 @@ object Test2 extends TestCase("append") with Assert { j0 append true append (1.toByte) append 'a' append 9 append -1L append 1.2e-10f append -2.1e+100d s0 append true append (1.toByte) append 'a' append 9 append -1L append 1.2e-10f append -2.1e+100d + assertEquals("s0.toString equals j0.toString", true, s0.toString equals j0.toString) val j1 = new java.lang.StringBuilder // Java 1.5+ diff --git a/test/files/neg/badtok-1.check b/test/files/neg/badtok-1.check index 94116d321c..318ba1fcbc 100644 --- a/test/files/neg/badtok-1.check +++ b/test/files/neg/badtok-1.check @@ -1,7 +1,7 @@ -badtok-1.scala:2: error: missing terminating quote +badtok-1.scala:2: error: expected class or object definition '42' ^ -badtok-1.scala:2: error: unterminated character literal +badtok-1.scala:2: error: unclosed character literal '42' ^ two errors found diff --git a/test/files/neg/badtok-2.check b/test/files/neg/badtok-2.check index 6364b857a1..5fb3bf660c 100644 --- a/test/files/neg/badtok-2.check +++ b/test/files/neg/badtok-2.check @@ -1,4 +1,4 @@ -badtok-2.scala:3: error: unterminated quoted identifier +badtok-2.scala:3: error: unclosed quoted identifier `x ^ badtok-2.scala:3: error: '}' expected but eof found. diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check index 252580a327..10b2a38586 100644 --- a/test/files/neg/bug550.check +++ b/test/files/neg/bug550.check @@ -1,4 +1,4 @@ -bug550.scala:6: error: class List takes type parameters +bug550.scala:6: error: type List takes type parameters def sum[a](xs: List)(implicit m: Monoid[a]): a = ^ bug550.scala:8: error: no implicit argument matching parameter type Monoid[a] was found. diff --git a/test/files/neg/bug585.check b/test/files/neg/bug585.check index af66898383..4f4c5bf31d 100644 --- a/test/files/neg/bug585.check +++ b/test/files/neg/bug585.check @@ -1,4 +1,4 @@ -bug585.scala:1: error: unterminated comment +bug585.scala:1: error: unclosed comment /* ^ one error found diff --git a/test/files/neg/bug668.check b/test/files/neg/bug668.check index 698cef67e9..10be0c8d14 100644 --- a/test/files/neg/bug668.check +++ b/test/files/neg/bug668.check @@ -1,4 +1,4 @@ -bug668.scala:1: error: trait Iterable takes type parameters +bug668.scala:1: error: type Iterable takes type parameters class Test extends Iterable ^ one error found diff --git a/test/files/neg/bug876.check b/test/files/neg/bug876.check index 8ef2c031fc..a9aecbaadc 100644 --- a/test/files/neg/bug876.check +++ b/test/files/neg/bug876.check @@ -1,4 +1,4 @@ -bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.A)manager.B in trait Map +bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.A)manager.B in trait MapTemplate assert(manager.map(A2) == List(manager.map(A2, A1))) ^ one error found diff --git a/test/files/neg/bug910.check b/test/files/neg/bug910.check index ffb07faf2a..4ec73094cd 100644 --- a/test/files/neg/bug910.check +++ b/test/files/neg/bug910.check @@ -1,5 +1,5 @@ bug910.scala:4: error: type mismatch; - found : Seq[Char] + found : Sequence[Char] required: Seq[int] val y: Seq[int] = rest ^ diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 21d0d819ea..df1266066e 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -23,8 +23,8 @@ checksensible.scala:11: warning: comparing a fresh object using `==' will always println(new Object == new Object) ^ checksensible.scala:12: warning: comparing a fresh object using `!=' will always yield true - println(new Array(1) != new Array(1)) - ^ + println(new Exception() != new Exception()) + ^ checksensible.scala:15: warning: comparing values of types Int and Null using `==' will always yield false if (foo.length == null) // == 0 makes more sense, but still ^ diff --git a/test/files/neg/checksensible.scala b/test/files/neg/checksensible.scala index 1fed2e4b57..f895d09d0b 100644 --- a/test/files/neg/checksensible.scala +++ b/test/files/neg/checksensible.scala @@ -9,7 +9,7 @@ class Test { println(((x: Int) => x + 1) == null) println(new Object == new Object) - println(new Array(1) != new Array(1)) + println(new Exception() != new Exception()) val foo: Array[String] = Array("1","2","3") if (foo.length == null) // == 0 makes more sense, but still diff --git a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 deleted file mode 100644 index 835b5b8a05..0000000000 --- a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -b27d9a4cc768179da1d43f77dff631f900f050d0 ?plugins.jar diff --git a/test/files/neg/t0003.check b/test/files/neg/t0003.check index 5e29b189db..fb5bb5671d 100644 --- a/test/files/neg/t0003.check +++ b/test/files/neg/t0003.check @@ -1,6 +1,6 @@ t0003.scala:2: error: type mismatch; found : (A) => (B) => B - required: (?) => B + required: (A) => B def foo[A, B, C](l: List[A], f: A => B=>B, g: B=>B=>C): List[C] = l map (g compose f) ^ one error found diff --git a/test/files/neg/t0259.check b/test/files/neg/t0259.check index 8c6ce1d269..b0ab856278 100644 --- a/test/files/neg/t0259.check +++ b/test/files/neg/t0259.check @@ -1,7 +1,7 @@ t0259.scala:4: error: double definition: constructor TestCase3:(String*)test.TestCase3 and constructor TestCase3:((String, Int)*)test.TestCase3 at line 3 -have same type after erasure: (Seq)test.TestCase3 +have same type after erasure: (Sequence)test.TestCase3 def this( groups: String*) = this() ^ one error found diff --git a/test/files/neg/t0673.check b/test/files/neg/t0673.check index abb37a022c..cc67e994f4 100644 --- a/test/files/neg/t0673.check +++ b/test/files/neg/t0673.check @@ -1,4 +1,4 @@ -Test.scala:2: error: value InnerClass is not a member of object JavaClass +Test.scala:2: error: object InnerClass is not a value val x = JavaClass.InnerClass ^ one error found diff --git a/test/files/neg/wellkinded_bounds.check b/test/files/neg/wellkinded_bounds.check index 9099934c68..806eb09a76 100644 --- a/test/files/neg/wellkinded_bounds.check +++ b/test/files/neg/wellkinded_bounds.check @@ -1,4 +1,4 @@ -wellkinded_bounds.scala:2: error: class List takes type parameters +wellkinded_bounds.scala:2: error: type List takes type parameters class WellKindedWrongSyntax[s <: List] { // must be s[x] <: List[x] ^ one error found diff --git a/test/files/neg/xmlcorner.check b/test/files/neg/xmlcorner.check index 5d3e9288d5..8791829e50 100644 --- a/test/files/neg/xmlcorner.check +++ b/test/files/neg/xmlcorner.check @@ -3,5 +3,5 @@ xmlcorner.scala:2: error: illegal start of simple expression ^ xmlcorner.scala:5: error: in XML literal: name cannot end in ':' val wrong = <bla: /> - ^ + ^ two errors found diff --git a/test/files/pos/bug0029.scala b/test/files/pos/bug0029.scala index 1b33c6cffd..0af45ab62d 100644 --- a/test/files/pos/bug0029.scala +++ b/test/files/pos/bug0029.scala @@ -1,3 +1,3 @@ object Main { - def f[a]: List[List[a]] = for (val l1 <- Nil; val l2 <- Nil) yield l1; + def f[a]: List[List[a]] = for (val l1 <- Nil; val l2 <- Nil) yield l1 } diff --git a/test/files/pos/bug1049.scala b/test/files/pos/bug1049.scala index 452259b9f8..3cc9d0cc58 100644 --- a/test/files/pos/bug1049.scala +++ b/test/files/pos/bug1049.scala @@ -2,6 +2,6 @@ package bug1049 abstract class Test { type T <: A - class A requires T - class B requires T extends A + class A { self: T => } + class B extends A { self: T => } } diff --git a/test/files/pos/bug1050.scala b/test/files/pos/bug1050.scala index 8ca79716a9..1dfa20c988 100644 --- a/test/files/pos/bug1050.scala +++ b/test/files/pos/bug1050.scala @@ -2,7 +2,7 @@ package bug1050 abstract class A { type T <: scala.ScalaObject - class A requires T { + class A { this: T => def b = 3 def c = b b diff --git a/test/files/pos/bug247.scala b/test/files/pos/bug247.scala index bfd9d9694f..e2655c6ab3 100644 --- a/test/files/pos/bug247.scala +++ b/test/files/pos/bug247.scala @@ -16,10 +16,11 @@ class Tree[KEY,Entry](order:Order[KEY]) { def size =0; } -class TreeMap[KEY,VALUE](_factory:TreeMapFactory[KEY]) extends Tree[KEY,Pair[KEY,VALUE]](_factory.order) with Map[KEY, VALUE] { +class TreeMap[KEY,VALUE](_factory:TreeMapFactory[KEY]) extends Tree[KEY,Pair[KEY,VALUE]](_factory.order) with scala.collection.DefaultMap[KEY, VALUE] with Map[KEY, VALUE] { val factory = _factory val order = _factory.order; def this(newOrder:Order[KEY]) = this(new TreeMapFactory[KEY](newOrder)); def get(key:KEY) = null; def elements:Iterator[Pair[KEY,VALUE]] = null; + override def size = super[Tree].size } diff --git a/test/files/pos/bug516.scala b/test/files/pos/bug516.scala.disabled index 67e1799f28..623684e582 100644 --- a/test/files/pos/bug516.scala +++ b/test/files/pos/bug516.scala.disabled @@ -3,7 +3,7 @@ import scala.collection.mutable._; class Members; object subscriber extends Subscriber[Message[String] with Undoable, Members] { - def notify(pub: Members, event: Message[String] with Undoable): Unit = + def notify(pub: Members, event: Message[String] with Undoable): Unit = (event: Message[String]) match { case Include(elem) => Console.println("ADD: " + elem); case Remove(elem) => Console.println("REM: " + elem); @@ -11,4 +11,4 @@ object subscriber extends Subscriber[Message[String] with Undoable, Members] { //case r : Remove [HasTree] with Undoable => } } - + diff --git a/test/files/pos/bug927.scala b/test/files/pos/bug927.scala index 1a906cd9bc..5887aba255 100644 --- a/test/files/pos/bug927.scala +++ b/test/files/pos/bug927.scala @@ -2,7 +2,7 @@ object Test { def sum(stream: Stream[Int]): Int = stream match { - case Stream.empty => 0 + case Stream.Empty => 0 case Stream.cons(hd, tl) => hd + sum(tl) } val str: Stream[Int] = Stream.fromIterator(List(1,2,3).elements) diff --git a/test/files/pos/collections.scala b/test/files/pos/collections.scala.disabled index 4f45a42786..4f45a42786 100644 --- a/test/files/pos/collections.scala +++ b/test/files/pos/collections.scala.disabled diff --git a/test/files/pos/sudoku.scala b/test/files/pos/sudoku.scala index 8f42e56264..9875b22cfd 100644 --- a/test/files/pos/sudoku.scala +++ b/test/files/pos/sudoku.scala @@ -2,7 +2,7 @@ object SudokuSolver extends Application { // The board is represented by an array of strings (arrays of chars), // held in a global variable m. The program begins by reading 9 lines // of input to fill the board - var m: Array[Array[Char]] = List.tabulate(9, (x: Int) => readLine.toArray).toArray + var m: Array[Array[Char]] = Array.tabulate(9)((x: Int) => readLine.toArray) // For printing m, a method print is defined def print = { println(""); m map (carr => println(new String(carr))) } diff --git a/test/files/pos/t0165.scala b/test/files/pos/t0165.scala index 05c4a1c77a..76aef85240 100755 --- a/test/files/pos/t0165.scala +++ b/test/files/pos/t0165.scala @@ -1,5 +1,5 @@ package test3 -import scala.collection.jcl.LinkedHashMap +import scala.collection.mutable.LinkedHashMap trait Main { def asMany : ArrayResult = { diff --git a/test/files/pos/t1049.scala b/test/files/pos/t1049.scala deleted file mode 100755 index dad83579a6..0000000000 --- a/test/files/pos/t1049.scala +++ /dev/null @@ -1,9 +0,0 @@ -class J { - type tttt[a, b] <: _root_.scala.collection.mutable.Map[a, b] - - def r(a : tttt[String, String]) = { - 0 match { - case a : a.MapTo => - } - } -} diff --git a/test/files/pos5/signatures/Test.java b/test/files/pos5/signatures/Test.java index ac34bcea0c..8ecac29910 100644 --- a/test/files/pos5/signatures/Test.java +++ b/test/files/pos5/signatures/Test.java @@ -1,4 +1,4 @@ -import scala.RandomAccessSeq.Mutable; +import scala.collection.mutable.Vector; import test.Outer; /* Test correct generation of java signatures. The Outer class should not diff --git a/test/files/run/bug1074.check b/test/files/run/bug1074.check index 7dc074205c..ecff8510ed 100644 --- a/test/files/run/bug1074.check +++ b/test/files/run/bug1074.check @@ -1,3 +1,3 @@ -q0 = Set(kl, jk, fg, ef, gh, a, cd, de, hj, b, lm, mn) +q0 = Set(kl, jk, cd, fg, a, ef, gh, de, hj, b, lm, mn) q1 = Set() 0 q2 = Set() 0 diff --git a/test/files/run/classof.check b/test/files/run/classof.check index af7082f5b8..0d650b87c0 100644 --- a/test/files/run/classof.check +++ b/test/files/run/classof.check @@ -10,13 +10,13 @@ float double Class types class SomeClass -class scala.List +class scala.collection.immutable.List class scala.Tuple2 Arrays: class [Lscala.runtime.BoxedUnit; class [I class [D -class [Lscala.List; +class [Lscala.collection.immutable.List; Functions: interface scala.Function2 interface scala.Function1 diff --git a/test/files/run/collections.check b/test/files/run/collections.check index 0442e48702..b87a5998c5 100644 --- a/test/files/run/collections.check +++ b/test/files/run/collections.check @@ -32,7 +32,3 @@ test4: 25005003 test1: 14005 test2: 9007003, iters = 3000 test3: 9007003 -***** immutable.UnBalancedTreeMap: -test1: 14005 -test2: 1013003, iters = 1000 -test3: 1013003 diff --git a/test/files/run/collections.scala b/test/files/run/collections.scala index 7c723c9fc7..f286123322 100644 --- a/test/files/run/collections.scala +++ b/test/files/run/collections.scala @@ -113,5 +113,4 @@ object Test extends Application { test("immutable.Map", immutable.Map[Int, Int](), 5000) test("immutable.TreeMap", new immutable.TreeMap[Int, Int], 5000) test("immutable.ListMap", new immutable.ListMap[Int, Int], 3000) - test("immutable.UnBalancedTreeMap", new immutable.UnbalancedTreeMap[Int, Int], 1000) } diff --git a/test/files/run/colltest.scala b/test/files/run/colltest.scala index 65c3676297..5809812838 100644 --- a/test/files/run/colltest.scala +++ b/test/files/run/colltest.scala @@ -46,5 +46,5 @@ class TestSet(s0: Set[Int], s1: Set[Int]) { Console.println("succeeded for "+Iterations+" iterations.") } object Test extends Application { - new TestSet(HashSet.empty, new scala.collection.jcl.LinkedHashSet) + new TestSet(HashSet.empty, new scala.collection.mutable.LinkedHashSet) } diff --git a/test/files/run/constrained-types.scala b/test/files/run/constrained-types.scala index b640db1d67..56fbd749c0 100644 --- a/test/files/run/constrained-types.scala +++ b/test/files/run/constrained-types.scala @@ -89,6 +89,7 @@ object Test { val settings = new Settings settings.Xexperimental.value = true settings.selfInAnnots.value = true + settings.deprecation.value = true val interp = new Interpreter(settings) diff --git a/test/files/run/infiniteloop.check b/test/files/run/infiniteloop.check index be0b1437f1..6f8cf6e4d9 100644 --- a/test/files/run/infiniteloop.check +++ b/test/files/run/infiniteloop.check @@ -1 +1 @@ -Stream(512, ?) +Stream(512, 256, 128, 64, 32, 16, 8, 4, 2, 1) diff --git a/test/files/run/patmatnew.scala b/test/files/run/patmatnew.scala index 615046bf14..3840b44b86 100644 --- a/test/files/run/patmatnew.scala +++ b/test/files/run/patmatnew.scala @@ -311,7 +311,7 @@ object Test extends TestConsoleMain { object TestStream extends TestCase("unapply for Streams") { def sum(stream: Stream[Int]): Int = stream match { - case Stream.empty => 0 + case Stream.Empty => 0 case Stream.cons(hd, tl) => hd + sum(tl) } diff --git a/test/files/run/range.scala b/test/files/run/range.scala index 5d0ca84c0b..18f3ace645 100644 --- a/test/files/run/range.scala +++ b/test/files/run/range.scala @@ -2,7 +2,7 @@ object Test extends Application{ def rangeForeach(range : Range) = { val buffer = new scala.collection.mutable.ListBuffer[Int]; range.foreach(buffer += _); - assert(buffer.toList == range.elements.toList); + assert(buffer.toList == range.elements.toList, buffer.toList+"/"+range.elements.toList) } rangeForeach(1 to 10); diff --git a/test/files/run/t1323.scala b/test/files/run/t1323.scala index 7a68482101..d84239a12c 100644 --- a/test/files/run/t1323.scala +++ b/test/files/run/t1323.scala @@ -1,25 +1,25 @@ object Test extends Application { - println(" 1:" + List(1,2,3,4).indexOf(List(0,1))) // -1 - println(" 2:" + List(1,2,3,4).indexOf(List(1,2))) // 0 - println(" 3:" + List(1,2,3,4).indexOf(List(2,3))) // 1 - println(" 4:" + List(1,2,3,4).indexOf(List(3,4))) // 2 - println(" 5:" + List(1,2,3,4).indexOf(List(4,5))) // -1 - println(" 6:" + List(1,2,3,4).indexOf(List(2,4))) // -1 - println(" 7:" + List(1,2,3,4).indexOf(List(4,3))) // -1 - println(" 8:" + List(1,2,3,4).indexOf(List(1,3))) // -1 - println(" 9:" + List(1,2,3,4).indexOf(List(1,3))) // -1 - println("10:" + List(1,2,3,4).indexOf(List(1,2,3,4))) // 0 - println("11:" + List(1,2,3,4).indexOf(List(4,3,2,1))) // -1 - println("12:" + List(1,2,3,4).indexOf(List(1,2,3,4,5))) // -1 - println("13:" + List(1,2,3,4).indexOf(List(5,4,3,2,1))) // -1 - println("14:" + List(1,2,3,4).indexOf(List())) // 0 - println("15:" + List().indexOf(List())) // 0 - println("16:" + List().indexOf(List(1,2,3,4))) // -1 + println(" 1:" + List(1,2,3,4).indexOfSeq(List(0,1))) // -1 + println(" 2:" + List(1,2,3,4).indexOfSeq(List(1,2))) // 0 + println(" 3:" + List(1,2,3,4).indexOfSeq(List(2,3))) // 1 + println(" 4:" + List(1,2,3,4).indexOfSeq(List(3,4))) // 2 + println(" 5:" + List(1,2,3,4).indexOfSeq(List(4,5))) // -1 + println(" 6:" + List(1,2,3,4).indexOfSeq(List(2,4))) // -1 + println(" 7:" + List(1,2,3,4).indexOfSeq(List(4,3))) // -1 + println(" 8:" + List(1,2,3,4).indexOfSeq(List(1,3))) // -1 + println(" 9:" + List(1,2,3,4).indexOfSeq(List(1,3))) // -1 + println("10:" + List(1,2,3,4).indexOfSeq(List(1,2,3,4))) // 0 + println("11:" + List(1,2,3,4).indexOfSeq(List(4,3,2,1))) // -1 + println("12:" + List(1,2,3,4).indexOfSeq(List(1,2,3,4,5))) // -1 + println("13:" + List(1,2,3,4).indexOfSeq(List(5,4,3,2,1))) // -1 + println("14:" + List(1,2,3,4).indexOfSeq(List())) // 0 + println("15:" + List().indexOfSeq(List())) // 0 + println("16:" + List().indexOfSeq(List(1,2,3,4))) // -1 // Do some testing with infinite sequences def from(n: Int): Stream[Int] = Stream.cons(n, from(n + 1)) - println("17:" + List(1,2,3,4).indexOf(from(1))) // -1 - println("18:" + from(1).indexOf(List(4,5,6))) // 3 + println("17:" + List(1,2,3,4).indexOfSeq(from(1))) // -1 + println("18:" + from(1).indexOfSeq(List(4,5,6))) // 3 } diff --git a/test/files/run/unapply.scala b/test/files/run/unapply.scala index 3325d034d3..f540b2a2a9 100644 --- a/test/files/run/unapply.scala +++ b/test/files/run/unapply.scala @@ -107,7 +107,7 @@ object StreamFoo extends TestCase("unapply for Streams") with Assert { def sum(stream: Stream[Int]): Int = stream match { - case Stream.empty => 0 + case Stream.Empty => 0 case Stream.cons(hd, tl) => hd + sum(tl) } override def runTest { diff --git a/test/files/run/withIndex.scala b/test/files/run/withIndex.scala index 6d470878d9..f0c3e7a468 100644 --- a/test/files/run/withIndex.scala +++ b/test/files/run/withIndex.scala @@ -19,7 +19,7 @@ object Test { val emptyArray = new Array[String](0) val emptyList: List[String] = Nil val emptyIterator = emptyList.elements - val emptyStream = Stream.empty + val emptyStream: Stream[String] = Stream.empty Console.println(emptyArray.zipWithIndex.toList) Console.println(emptyList.zipWithIndex.toList) diff --git a/test/pending/pos/t1107/Object.scala b/test/pending/pos/t1107/Object.scala new file mode 100755 index 0000000000..0fd04695b1 --- /dev/null +++ b/test/pending/pos/t1107/Object.scala @@ -0,0 +1,10 @@ +object O +{ + def d(t: Top) = + t match + { + case s: Sub => true + case _ => false + } +} + diff --git a/test/pending/pos/t1107/Trait.scala b/test/pending/pos/t1107/Trait.scala new file mode 100755 index 0000000000..cd213f9780 --- /dev/null +++ b/test/pending/pos/t1107/Trait.scala @@ -0,0 +1,9 @@ +sealed trait Top +sealed trait Sub extends Top + +trait C +{ + private object P extends Sub +} + + |