3 files changed, 90 insertions, 15 deletions

diff --git a/test/junit/scala/reflect/internal/PrintersTest.scala b/test/junit/scala/reflect/internal/PrintersTest.scala
index 9bfe6eecb8..2305e7ea50 100644
--- a/test/junit/scala/reflect/internal/PrintersTest.scala
+++ b/test/junit/scala/reflect/internal/PrintersTest.scala
@@ -8,14 +8,6 @@ import scala.reflect.runtime.{currentMirror=>cm}
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
-@RunWith(classOf[JUnit4])
-class PrintersTest extends BasePrintTests
-  with ClassPrintTests
-  with TraitPrintTests
-  with ValAndDefPrintTests
-  with QuasiTreesPrintTests
-  with PackagePrintTests
-
 object PrinterHelper {
   val toolbox = cm.mkToolBox()
 
@@ -73,7 +65,8 @@ object PrinterHelper {
 
 import PrinterHelper._
 
-trait BasePrintTests {
+@RunWith(classOf[JUnit4])
+class BasePrintTest {
   @Test def testIdent = assertTreeCode(Ident("*"))("*")
 
   @Test def testConstant1 = assertTreeCode(Literal(Constant("*")))("\"*\"")
@@ -348,7 +341,8 @@ trait BasePrintTests {
   @Test def testImport4 = assertPrintedCode("import scala.collection._")
 }
 
-trait ClassPrintTests {
+@RunWith(classOf[JUnit4])
+class ClassPrintTest {
   @Test def testClass = assertPrintedCode("class *")
 
   @Test def testClassWithBody = assertPrintedCode(sm"""
@@ -833,7 +827,8 @@ trait ClassPrintTests {
     |}""")
 }
 
-trait TraitPrintTests {
+@RunWith(classOf[JUnit4])
+class TraitPrintTest {
   @Test def testTrait = assertPrintedCode("trait *")
 
   @Test def testTraitWithBody = assertPrintedCode(sm"""
@@ -953,7 +948,8 @@ trait TraitPrintTests {
     |}""")  
 }
 
-trait ValAndDefPrintTests {
+@RunWith(classOf[JUnit4])
+class ValAndDefPrintTest {
   @Test def testVal1 = assertPrintedCode("val a: scala.Unit = ()")
 
   @Test def testVal2 = assertPrintedCode("val * : scala.Unit = ()")
@@ -1093,7 +1089,8 @@ trait ValAndDefPrintTests {
     |}""", wrapCode = true)
 }
 
-trait PackagePrintTests {
+@RunWith(classOf[JUnit4])
+class PackagePrintTest {
   @Test def testPackage1 = assertPrintedCode(sm"""
     |package foo.bar {
     |  
@@ -1131,7 +1128,8 @@ trait PackagePrintTests {
     |}""", checkTypedTree = false)
 }
 
-trait QuasiTreesPrintTests {
+@RunWith(classOf[JUnit4])
+class QuasiTreesPrintTest {
   @Test def testQuasiIdent = assertTreeCode(q"*")("*")
 
   @Test def testQuasiVal = assertTreeCode(q"val * : Unit = null")("val * : Unit = null")
diff --git a/test/junit/scala/reflect/internal/TreeGenTest.scala b/test/junit/scala/reflect/internal/TreeGenTest.scala
new file mode 100644
index 0000000000..db1ea5cf6a
--- /dev/null
+++ b/test/junit/scala/reflect/internal/TreeGenTest.scala
@@ -0,0 +1,51 @@
+package scala.reflect.internal
+
+import org.junit.Assert._
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+import scala.runtime.ScalaRunTime
+import scala.tools.nsc.symtab.SymbolTableForUnitTesting
+
+@RunWith(classOf[JUnit4])
+class TreeGenTest {
+  object symbolTable extends SymbolTableForUnitTesting
+
+  import symbolTable._
+
+  @Test
+  def attributedRefToTopLevelMemberNotPrefixedByThis_t9473_a(): Unit = {
+    val SomeClass = symbolOf[Some[_]]
+    val ref = gen.mkAttributedRef(SomeClass)
+    assertEquals("scala.Some", ref.toString) // was scala.this.Some
+    ref match {
+      case sel @ Select(pre @ Ident(preName), name) =>
+      assertEquals(TermName("scala"), preName)
+        assertEquals(TypeName("Some"), name)
+        assertEquals(SomeClass, sel.symbol)
+      case _ => fail(showRaw(ref))
+    }
+  }
+
+  @Test
+  def attributedRefToTopLevelMemberNotPrefixedByThis_t9473_b(): Unit = {
+    val ScalaRuntimeModule = symbolOf[ScalaRunTime.type].sourceModule
+    val ref = gen.mkAttributedRef(ScalaRuntimeModule)
+    assertEquals("scala.runtime.ScalaRunTime", ref.toString)
+    ref match {
+      case sel @ Select(Select(Ident(TermName("scala")), TermName("runtime")), TermName("ScalaRunTime")) =>
+      case _ => fail(showRaw(ref))
+    }
+  }
+  @Test
+  def attributedRefToTopLevelMemberNotPrefixedByThis_t9473_c(): Unit = {
+    val DummyImplicitClass = symbolOf[Predef.DummyImplicit]
+    val ref = gen.mkAttributedRef(DummyImplicitClass)
+    assertEquals("scala.Predef.DummyImplicit", ref.toString)
+//    ref match {
+//      case sel @ Select(Select(Ident(TermName("scala")), TermName("runtime")), TermName("ScalaRunTime")) =>
+//      case _ => fail(showRaw(ref))
+//    }
+  }
+}
diff --git a/test/junit/scala/reflect/internal/TypesTest.scala b/test/junit/scala/reflect/internal/TypesTest.scala
index 95194ef0a4..05a77cfb47 100644
--- a/test/junit/scala/reflect/internal/TypesTest.scala
+++ b/test/junit/scala/reflect/internal/TypesTest.scala
@@ -1,9 +1,10 @@
 package scala.reflect.internal
 
 import org.junit.Assert._
-import org.junit.Test
+import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scala.collection.mutable
 import scala.tools.nsc.symtab.SymbolTableForUnitTesting
 
 @RunWith(classOf[JUnit4])
@@ -32,4 +33,29 @@ class TypesTest {
     val uniquelyNarrowed2 = refinedType(boolWithString1narrow2 :: Nil, NoSymbol)
     assert(uniquelyNarrowed1 =:= uniquelyNarrowed2)
   }
+
+  @Test
+  def testTransitivityWithModuleTypeRef(): Unit = {
+    import rootMirror.EmptyPackageClass
+    val (module, moduleClass) = EmptyPackageClass.newModuleAndClassSymbol(TermName("O"), NoPosition, 0L)
+    val minfo = ClassInfoType(List(ObjectTpe), newScope, moduleClass)
+    module.moduleClass setInfo minfo
+    module setInfo module.moduleClass.tpe
+    val tp1 = TypeRef(ThisType(EmptyPackageClass), moduleClass, Nil)
+    val tp2 = SingleType(ThisType(EmptyPackageClass), module)
+    val tp3 = ThisType(moduleClass)
+    val tps = List(tp1, tp2, tp3)
+    val results = mutable.Buffer[String]()
+    tps.permutations.foreach {
+      case ts @ List(a, b, c) =>
+        def tsShownRaw = ts.map(t => showRaw(t)).mkString(", ")
+        if (a <:< b && b <:< c && !(a <:< c)) results += s"<:< intransitive: $tsShownRaw"
+        if (a =:= b && b =:= c && !(a =:= c)) results += s"=:= intransitive: $tsShownRaw"
+    }
+    results.toList match {
+      case Nil => // okay
+      case xs =>
+        Assert.fail(xs.mkString("\n"))
+    }
+  }
 }