summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-02-16 16:28:31 +0000
committerPaul Phillips <paulp@improving.org>2009-02-16 16:28:31 +0000
commit10b8c781c2d20d2a00f70a9426951ea374e5d07e (patch)
tree03d714c7d5c757e3ee5990565b5f1646f322b578 /test
parentbb15b2d1d7e5caccc8b08a0f30c0e7f381921478 (diff)
downloadscala-10b8c781c2d20d2a00f70a9426951ea374e5d07e.tar.gz
scala-10b8c781c2d20d2a00f70a9426951ea374e5d07e.tar.bz2
scala-10b8c781c2d20d2a00f70a9426951ea374e5d07e.zip
Began evaluation of the tests in pending, and m...
Began evaluation of the tests in pending, and moved/updated/removed .scala and .check files as warranted.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/badtok-3.check4
-rw-r--r--test/files/neg/badtok-3.scala (renamed from test/pending/neg/badtok-3.scala)0
-rw-r--r--test/files/neg/bug112706A.check6
-rw-r--r--test/files/neg/bug112706A.scala (renamed from test/pending/neg/bug112706A.scala)0
-rw-r--r--test/files/neg/parstar.check7
-rw-r--r--test/files/neg/parstar.scala (renamed from test/pending/neg/parstar.scala)0
-rw-r--r--test/files/neg/t0673.check4
-rw-r--r--test/files/neg/t0673/JavaClass.java (renamed from test/pending/neg/t0673/JavaClass.java)0
-rw-r--r--test/files/neg/t0673/Test.scala (renamed from test/pending/neg/t0673/Test.scala)0
-rw-r--r--test/files/neg/t0699.check (renamed from test/pending/neg/t0699.check)0
-rw-r--r--test/files/neg/t0699/A.scala (renamed from test/pending/pos/t0699/A.scala)0
-rw-r--r--test/files/neg/t0699/B.scala (renamed from test/pending/pos/t0699/B.scala)0
-rw-r--r--test/files/pos/t1439.scala (renamed from test/pending/pos/t1439.scala)0
-rw-r--r--test/pending/neg/badtok-3.check1
-rw-r--r--test/pending/neg/bug112506A.scala2
-rw-r--r--test/pending/neg/bug421.scala9
-rw-r--r--test/pending/neg/bug452.check6
-rw-r--r--test/pending/neg/bug452.scala8
-rw-r--r--test/pending/neg/bug558.check4
-rw-r--r--test/pending/neg/bug558.scala19
-rw-r--r--test/pending/neg/t0605.scala3
-rw-r--r--test/pending/neg/t0673.check4
-rw-r--r--test/pending/neg/t1049.scala5
23 files changed, 22 insertions, 60 deletions
diff --git a/test/files/neg/badtok-3.check b/test/files/neg/badtok-3.check
new file mode 100644
index 0000000000..ec1b0591fa
--- /dev/null
+++ b/test/files/neg/badtok-3.check
@@ -0,0 +1,4 @@
+badtok-3.scala:2: error: input ended while parsing XML
+ <x
+ ^
+one error found
diff --git a/test/pending/neg/badtok-3.scala b/test/files/neg/badtok-3.scala
index 66bfb308e6..66bfb308e6 100644
--- a/test/pending/neg/badtok-3.scala
+++ b/test/files/neg/badtok-3.scala
diff --git a/test/files/neg/bug112706A.check b/test/files/neg/bug112706A.check
new file mode 100644
index 0000000000..8fb5bfc390
--- /dev/null
+++ b/test/files/neg/bug112706A.check
@@ -0,0 +1,6 @@
+bug112706A.scala:5: error: constructor cannot be instantiated to expected type;
+ found : (T1, T2)
+ required: java.lang.String
+ case Tuple2(node,_) =>
+ ^
+one error found
diff --git a/test/pending/neg/bug112706A.scala b/test/files/neg/bug112706A.scala
index fb98ad300c..fb98ad300c 100644
--- a/test/pending/neg/bug112706A.scala
+++ b/test/files/neg/bug112706A.scala
diff --git a/test/files/neg/parstar.check b/test/files/neg/parstar.check
new file mode 100644
index 0000000000..108f0f4de8
--- /dev/null
+++ b/test/files/neg/parstar.check
@@ -0,0 +1,7 @@
+parstar.scala:8: error: *-parameter must come last
+ def m(a: A*, b: B ) = a.toArray
+ ^
+parstar.scala:9: error: *-parameter must come last
+ def m(a: A*, b: B*) = a.toArray
+ ^
+two errors found
diff --git a/test/pending/neg/parstar.scala b/test/files/neg/parstar.scala
index dd8d108447..dd8d108447 100644
--- a/test/pending/neg/parstar.scala
+++ b/test/files/neg/parstar.scala
diff --git a/test/files/neg/t0673.check b/test/files/neg/t0673.check
new file mode 100644
index 0000000000..abb37a022c
--- /dev/null
+++ b/test/files/neg/t0673.check
@@ -0,0 +1,4 @@
+Test.scala:2: error: value InnerClass is not a member of object JavaClass
+ val x = JavaClass.InnerClass
+ ^
+one error found
diff --git a/test/pending/neg/t0673/JavaClass.java b/test/files/neg/t0673/JavaClass.java
index e469e13483..e469e13483 100644
--- a/test/pending/neg/t0673/JavaClass.java
+++ b/test/files/neg/t0673/JavaClass.java
diff --git a/test/pending/neg/t0673/Test.scala b/test/files/neg/t0673/Test.scala
index 43b97887e4..43b97887e4 100644
--- a/test/pending/neg/t0673/Test.scala
+++ b/test/files/neg/t0673/Test.scala
diff --git a/test/pending/neg/t0699.check b/test/files/neg/t0699.check
index c944da8c10..c944da8c10 100644
--- a/test/pending/neg/t0699.check
+++ b/test/files/neg/t0699.check
diff --git a/test/pending/pos/t0699/A.scala b/test/files/neg/t0699/A.scala
index 740d8ecda3..740d8ecda3 100644
--- a/test/pending/pos/t0699/A.scala
+++ b/test/files/neg/t0699/A.scala
diff --git a/test/pending/pos/t0699/B.scala b/test/files/neg/t0699/B.scala
index f1f17efe8f..f1f17efe8f 100644
--- a/test/pending/pos/t0699/B.scala
+++ b/test/files/neg/t0699/B.scala
diff --git a/test/pending/pos/t1439.scala b/test/files/pos/t1439.scala
index ae1fdd10b5..ae1fdd10b5 100644
--- a/test/pending/pos/t1439.scala
+++ b/test/files/pos/t1439.scala
diff --git a/test/pending/neg/badtok-3.check b/test/pending/neg/badtok-3.check
deleted file mode 100644
index 25486b9a2f..0000000000
--- a/test/pending/neg/badtok-3.check
+++ /dev/null
@@ -1 +0,0 @@
-(something about, input ended while scanning XML literal)
diff --git a/test/pending/neg/bug112506A.scala b/test/pending/neg/bug112506A.scala
index a833c6afad..5dffb5ebe6 100644
--- a/test/pending/neg/bug112506A.scala
+++ b/test/pending/neg/bug112506A.scala
@@ -1,5 +1,5 @@
package test;
-import scala.collection.immutable._;
+import scala.collection.immutable.ListSet
import scala.collection.mutable._;
trait TypeManagerXXX {
trait TypedNode;
diff --git a/test/pending/neg/bug421.scala b/test/pending/neg/bug421.scala
deleted file mode 100644
index bf7346f01a..0000000000
--- a/test/pending/neg/bug421.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-object foo {
- case class Bar(a:String, b:Object, c:String*);
-
-
- Bar("foo","meets","bar") match {
- case Bar("foo",_*) => error("huh?");
- }
-
-}
diff --git a/test/pending/neg/bug452.check b/test/pending/neg/bug452.check
deleted file mode 100644
index 308ec18bd4..0000000000
--- a/test/pending/neg/bug452.check
+++ /dev/null
@@ -1,6 +0,0 @@
-bug452.scala:3: error: type mismatch;
- found : Test
- required: Test.this.Foo
- def this() = this(this);
- ^
-one error found
diff --git a/test/pending/neg/bug452.scala b/test/pending/neg/bug452.scala
deleted file mode 100644
index 855406d0c4..0000000000
--- a/test/pending/neg/bug452.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Test {
- class Foo(x: Foo) {
- def this() = this(this);
- }
- def main(args: Array[String]): Unit = {
- new Foo();
- }
-}
diff --git a/test/pending/neg/bug558.check b/test/pending/neg/bug558.check
deleted file mode 100644
index a51856f0e6..0000000000
--- a/test/pending/neg/bug558.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug558.scala:13: error: value file is not a member of NewModel.this.RootURL
- final val source = top.file;
- ^
-one error found
diff --git a/test/pending/neg/bug558.scala b/test/pending/neg/bug558.scala
deleted file mode 100644
index f88471f776..0000000000
--- a/test/pending/neg/bug558.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package scala.tools.nsc.models;
-import scala.tools.util._;
-
-abstract class NewModel {
- abstract class SymbolURL {
- val top : RootURL;
- val name : String;
- val source : AbstractFile;
- }
- abstract class NodeURL extends SymbolURL {
- val parent : SymbolURL;
- final val top = parent.top;
- final val source = top.file;
-
- }
- abstract class RootURL extends SymbolURL {
- final val top : RootURL = this;
- }
-}
diff --git a/test/pending/neg/t0605.scala b/test/pending/neg/t0605.scala
deleted file mode 100644
index af24ceda83..0000000000
--- a/test/pending/neg/t0605.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Test {
- println "Hello"
-}
diff --git a/test/pending/neg/t0673.check b/test/pending/neg/t0673.check
deleted file mode 100644
index e52f65ada3..0000000000
--- a/test/pending/neg/t0673.check
+++ /dev/null
@@ -1,4 +0,0 @@
-Test.scala:2: error: not found: value JavaClass
- val x = JavaClass.InnerClass
- ^
-one error found
diff --git a/test/pending/neg/t1049.scala b/test/pending/neg/t1049.scala
deleted file mode 100644
index 8fb0f7fb6f..0000000000
--- a/test/pending/neg/t1049.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object T1049 {
- "abc" match {
- case x: x.Whatever =>
- }
-}