From 12a0200eae15615cf81caa3be8febda00c968919 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Sat, 23 Feb 2008 21:56:27 +0000
Subject: fixed tests

---
 test/files/neg/bug1241.check | 2 +-
 test/files/neg/t0204.check   | 4 ++--
 test/files/neg/t0218.check   | 6 +++---
 test/files/pos/bug812.scala  | 2 +-
 test/files/pos/michel4.scala | 4 ++--
 test/files/pos/t0231.scala   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/files')

diff --git a/test/files/neg/bug1241.check b/test/files/neg/bug1241.check
index b846270c1b..48c86cabb7 100644
--- a/test/files/neg/bug1241.check
+++ b/test/files/neg/bug1241.check
@@ -1,4 +1,4 @@
-bug1241.scala:5: error: class type required
+bug1241.scala:5: error: class type required but AnyRef{def hello(): Unit} found
   val x4 = new T { def hello() { println("4") } }        // error!
                ^
 one error found
diff --git a/test/files/neg/t0204.check b/test/files/neg/t0204.check
index ffa13e3df7..27b88d21d2 100644
--- a/test/files/neg/t0204.check
+++ b/test/files/neg/t0204.check
@@ -1,4 +1,4 @@
-t0204.scala:4: error: class type required
- trait C extends B
+t0204.scala:4: error: class type required but Program.A{type T = String} found
+ trait C extends B
                  ^
 one error found
diff --git a/test/files/neg/t0218.check b/test/files/neg/t0218.check
index 0f74da6ad6..c7a6d952b9 100644
--- a/test/files/neg/t0218.check
+++ b/test/files/neg/t0218.check
@@ -1,4 +1,4 @@
-t0218.scala:10: error: type P is abstract; cannot be instantiated
-    List(new PP) 
-         ^
+t0218.scala:10: error: class type required but APQ.this.P found
+    List(new PP) 
+             ^
 one error found
diff --git a/test/files/pos/bug812.scala b/test/files/pos/bug812.scala
index ccbe6db5ce..1c9c923b6c 100644
--- a/test/files/pos/bug812.scala
+++ b/test/files/pos/bug812.scala
@@ -2,6 +2,6 @@ package test;
 import scala.{Application => Main};
 class Test extends Main {
   import test.{Test => Hello}
-  super[Application].executionStart;
+  super[Application].main(Array("test"));
   private[Test] def xxx = 10;
 }
diff --git a/test/files/pos/michel4.scala b/test/files/pos/michel4.scala
index 2390be5d26..ce9de29a2e 100644
--- a/test/files/pos/michel4.scala
+++ b/test/files/pos/michel4.scala
@@ -1,7 +1,7 @@
 class A() {
-  val f : Int = 2
+  def f : Int = 2
 }
 
 class B() extends A() {
   override val f : Int = super.f
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/t0231.scala b/test/files/pos/t0231.scala
index 83d89dccb9..895e780421 100644
--- a/test/files/pos/t0231.scala
+++ b/test/files/pos/t0231.scala
@@ -1,5 +1,5 @@
 class Foo {
-  object aaa {
+  def aaa {
     println("a")
   }
 }
-- 
cgit v1.2.3