From 2619f09ad0a5fc8900fcacc4d704a55b255f52e7 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Tue, 8 Sep 2009 10:53:27 +0000 Subject: Reenabled two tests. --- test/files/pos/bug516.scala | 15 +++++++++++++++ test/files/pos/bug516.scala.disabled | 15 --------------- test/files/pos/collections.scala | 15 +++++++++++++++ test/files/pos/collections.scala.disabled | 15 --------------- 4 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 test/files/pos/bug516.scala delete mode 100644 test/files/pos/bug516.scala.disabled create mode 100644 test/files/pos/collections.scala delete mode 100644 test/files/pos/collections.scala.disabled (limited to 'test/files') diff --git a/test/files/pos/bug516.scala b/test/files/pos/bug516.scala new file mode 100644 index 0000000000..ce4e0e3dd6 --- /dev/null +++ b/test/files/pos/bug516.scala @@ -0,0 +1,15 @@ +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(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/bug516.scala.disabled b/test/files/pos/bug516.scala.disabled deleted file mode 100644 index 735b259436..0000000000 --- a/test/files/pos/bug516.scala.disabled +++ /dev/null @@ -1,15 +0,0 @@ -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(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 b/test/files/pos/collections.scala new file mode 100644 index 0000000000..61a25528c7 --- /dev/null +++ b/test/files/pos/collections.scala @@ -0,0 +1,15 @@ +package mixins; + +import scala.collection.mutable._; + +class Collections extends HashSet[Int] with ObservableSet[Int,Collections] { + override def +=(elem: Int): this.type = super.+=(elem); + override def -=(elem: Int): this.type = super.-=(elem); + override def clear: Unit = super.clear; + +} + +object collections extends Collections; + +//class Collections1 extends HashSet[Int] with ObservableSet[Int,Collections1]; +//object collections1 extends Collections1; diff --git a/test/files/pos/collections.scala.disabled b/test/files/pos/collections.scala.disabled deleted file mode 100644 index 61a25528c7..0000000000 --- a/test/files/pos/collections.scala.disabled +++ /dev/null @@ -1,15 +0,0 @@ -package mixins; - -import scala.collection.mutable._; - -class Collections extends HashSet[Int] with ObservableSet[Int,Collections] { - override def +=(elem: Int): this.type = super.+=(elem); - override def -=(elem: Int): this.type = super.-=(elem); - override def clear: Unit = super.clear; - -} - -object collections extends Collections; - -//class Collections1 extends HashSet[Int] with ObservableSet[Int,Collections1]; -//object collections1 extends Collections1; -- cgit v1.2.3