summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-09-08 10:52:24 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-09-08 10:52:24 +0000
commit97fd4b036ca3071196301794903e1fd37b62f923 (patch)
tree5b79bbd070322d0e6f86450b320cbe3defeacc76 /test
parent6b01bf9c30fb8f52415166739508286a08f9e3db (diff)
downloadscala-97fd4b036ca3071196301794903e1fd37b62f923.tar.gz
scala-97fd4b036ca3071196301794903e1fd37b62f923.tar.bz2
scala-97fd4b036ca3071196301794903e1fd37b62f923.zip
Updated disabled tests before moving them back.
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/bug516.scala.disabled5
-rw-r--r--test/files/pos/collections.scala.disabled4
2 files changed, 5 insertions, 4 deletions
diff --git a/test/files/pos/bug516.scala.disabled b/test/files/pos/bug516.scala.disabled
index 623684e582..735b259436 100644
--- a/test/files/pos/bug516.scala.disabled
+++ b/test/files/pos/bug516.scala.disabled
@@ -1,12 +1,13 @@
import scala.collection.mutable._;
+import scala.collection.script._;
class Members;
object subscriber extends Subscriber[Message[String] with Undoable, Members] {
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);
+ case Include(l, elem) => Console.println("ADD: " + elem);
+ case Remove(l, elem) => Console.println("REM: " + elem);
//case i : Include[HasTree] with Undoable =>
//case r : Remove [HasTree] with Undoable =>
}
diff --git a/test/files/pos/collections.scala.disabled b/test/files/pos/collections.scala.disabled
index 4f45a42786..61a25528c7 100644
--- a/test/files/pos/collections.scala.disabled
+++ b/test/files/pos/collections.scala.disabled
@@ -3,8 +3,8 @@ package mixins;
import scala.collection.mutable._;
class Collections extends HashSet[Int] with ObservableSet[Int,Collections] {
- override def +=(elem: Int): Unit = super.+=(elem);
- override def -=(elem: Int): Unit = super.-=(elem);
+ override def +=(elem: Int): this.type = super.+=(elem);
+ override def -=(elem: Int): this.type = super.-=(elem);
override def clear: Unit = super.clear;
}