Adapt tests

3 files changed, 28 insertions, 32 deletions

diff --git a/tests/pos/i1045.scala b/tests/pos/i1045.scala
index f5985af92..f0cf1df90 100644
--- a/tests/pos/i1045.scala
+++ b/tests/pos/i1045.scala
@@ -1,7 +1,24 @@
 import scala.collection._
+
+object EmptyHashMap extends mutable.HashMap[Nothing, Nothing]
 object T {
   val newSymbolMap: mutable.HashMap[String, mutable.HashMap[Int, Double]] = mutable.HashMap.empty
   val map = newSymbolMap.getOrElse("a", mutable.HashMap.empty)
   map.put(1, 0.0)
   newSymbolMap.put("a", map)
+
+   /** A map storing free variables of functions and classes */
+//  type SymSet = Set[Symbol]
+//  private val free = new collection.mutable.LinkedHashMap[Symbol, SymSet]
+//  def freeVars(sym: Symbol): List[Symbol] = free.getOrElse(sym, Nil).toList
+
+  class Tree[X >: Null] { def tpe: X = null }
+  class Ident[X >: Null] extends Tree[X]
+  class Apply[X >: Null] extends Tree[X]
+
+  val x: Ident[Symbol] | Apply[Symbol] = ???
+  val y = x.tpe
+  val z: Symbol = y
+
+
 }
diff --git a/tests/pos/union.scala b/tests/pos/union.scala
new file mode 100644
index 000000000..8b20a8458
--- /dev/null
+++ b/tests/pos/union.scala
@@ -0,0 +1,11 @@
+object Test {
+
+  class A
+  class B extends A
+  class C extends A
+  class D extends A
+
+  val b = true
+  val x = if (b) new B else new C
+  val y: B | C = x
+}
diff --git a/tests/pos/unions.scala b/tests/pos/unions.scala
deleted file mode 100644
index e57a96fb9..000000000
--- a/tests/pos/unions.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-object unions {
-
-  class A {
-    def f: String = "abc"
-
-    def g(x: Int): Int = x
-    def g(x: Double): Double = x
-  }
-
-  class B {
-    def f: String = "bcd"
-
-    def g(x: Int) = -x
-    def g(x: Double): Double = -x
-  }
-
-  val x: A | B = if (true) new A else new B
-  def y: B | A = if (true) new A else new B
-  println(x.f)
-  println(x.g(2))
-  println(y.f)
-  println(y.g(1.0))
-
-  class C {
-    private def foo = 0
-    class D extends C {
-      private def foo = 1
-      def test(cd: C | D, dc: D | C) = (cd.foo, dc.foo)
-    }
-  }
-
-}