Move (most) unit tests to correct locations

Should still perhaps move `test/dotc/tests.scala` and the others in the
same directory to a better more cohesive location. Would like to delete
the worksheets as well - but maybe they hold sentimental value...

Author: felixmulder

project/Build.scala

@@ -125,7 +125,10 @@ object DottyBuild extends Build {
       },
 
       // enable verbose exception messages for JUnit
-      testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "--run-listener=test.ContextEscapeDetector"),
+      testOptions in Test += Tests.Argument(
+        TestFrameworks.JUnit, "-a", "-v",
+        "--run-listener=dotty.tools.ContextEscapeDetector"
+      ),
       testOptions in Test += Tests.Cleanup({ () => partestLockFile.delete }),
 
       lockPartestFile := {

test/dotc/comptest.scala

@@ -1,6 +1,6 @@
 package dotc
 
-import test._
+import dotty.tools.dotc.CompilerTest
 
 object comptest extends CompilerTest {
 

test/dotc/tests.scala

@@ -1,6 +1,6 @@
 package dotc
 
-import test._
+import dotty.tools.dotc.CompilerTest
 import org.junit.{Before, Test}
 
 import java.io.{ File => JFile }

test/test/ContextEscapeDetection.java renamed to test/dotty/tools/ContextEscapeDetection.java

@@ -1,4 +1,4 @@
-package test;
+package dotty.tools;
 
 import dotty.tools.dotc.core.Contexts;
 import org.junit.*;
@@ -7,7 +7,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-
 public abstract class ContextEscapeDetection {
     public static class TestContext{
         public TestContext(WeakReference<Contexts.Context> context, String testName) {
@@ -34,7 +33,4 @@ public synchronized void stealContext() {
     public synchronized void clearContext() {
         this.clearCtx();
     }
-
-
 }
-

test/test/ContextEscapeDetector.java renamed to test/dotty/tools/ContextEscapeDetector.java

@@ -1,9 +1,8 @@
-package test;
+package dotty.tools;
 
 import org.junit.runner.Result;
 import org.junit.runner.notification.RunListener;
 import org.junit.Assert;
-
 import java.lang.ref.WeakReference;
 
 public class ContextEscapeDetector extends RunListener {

test/test/DottyTest.scala renamed to test/dotty/tools/DottyTest.scala

@@ -1,22 +1,22 @@
-package test
+package dotty
+package tools
 
-import dotty.tools.dotc.core._
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Flags._
+import dotc.core._
+import dotc.core.Contexts._
+import dotc.core.Symbols._
+import dotc.core.Flags._
 import Types._, Symbols._, Decorators._
-import dotty.tools.dotc.printing.Texts._
-import dotty.tools.dotc.reporting.ConsoleReporter
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.Compiler
+import dotc.printing.Texts._
+import dotc.reporting.ConsoleReporter
+import dotc.core.Decorators._
+import dotc.ast.tpd
+import dotc.Compiler
 
-import dotty.tools.dotc
-import dotty.tools.dotc.core.Phases.Phase
+import dotc.core.Phases.Phase
 
 class DottyTest /*extends ContextEscapeDetection*/ {
 
-  dotty.tools.dotc.parsing.Scanners // initialize keywords
+  dotc.parsing.Scanners // initialize keywords
 
   implicit var ctx: Contexts.Context = {
     val base = new ContextBase

test/test/DottyTypeStealer.scala renamed to test/dotty/tools/DottyTypeStealer.scala

@@ -1,11 +1,11 @@
-package test
+package dotty.tools
 
-import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Names._
-import dotty.tools.dotc.ast.tpd._
-import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.Types.Type
+import dotc.ast.tpd
+import dotc.core.Names._
+import dotc.ast.tpd._
+import dotc.core.Contexts.Context
+import dotc.core.Decorators._
+import dotc.core.Types.Type
 
 object DottyTypeStealer {
   def stealType(source: String, typeStrings: String*): (Context, List[Type]) = {

test/test/ShowClassTests.scala renamed to test/dotty/tools/ShowClassTests.scala

@@ -1,13 +1,13 @@
-package test
+package dotty.tools
 
-import dotty.tools.dotc.core._
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.Types._
-import dotty.tools.dotc.printing.Texts._
+import dotc.core._
+import dotc.core.Contexts._
+import dotc.core.Symbols._
+import dotc.core.Flags._
+import dotc.core.Types._
+import dotc.printing.Texts._
 import NameOps._
-import dotty.tools.dotc.core.Decorators._
+import dotc.core.Decorators._
 import org.junit.Test
 
 class ShowClassTests extends DottyTest {

test/test/TypeStealer.scala renamed to test/dotty/tools/TypeStealer.scala

@@ -1,19 +1,15 @@
-package test
+package dotty.tools
+
 import scala.tools.nsc.interpreter._
 import scala.tools.nsc.Settings
 
-/**
- * Dotty requires a mangled bootclasspath to start. It means that `console` mode of sbt doesn't work for us.
- * At least I(Dmitry) wasn't able to make sbt fork in console
- */
 object TypeStealer {
   def main(args: Array[String]): Unit = {
     def repl = new ILoop {}
 
     val settings = new Settings
     settings.Yreplsync.value = true
 
-
     //use when launching normally outside SBT
     settings.usejavacp.value = true
 

test/test/AsmConverters.scala renamed to test/dotty/tools/backend/jvm/AsmConverters.scala

@@ -1,4 +1,4 @@
-package test
+package dotty.tools.backend.jvm
 
 import scala.tools.asm
 import asm._

test/test/AsmNode.scala renamed to test/dotty/tools/backend/jvm/AsmNode.scala

@@ -1,4 +1,4 @@
-package test
+package dotty.tools.backend.jvm
 
 import java.lang.reflect.Modifier
 import scala.tools.asm

test/test/DottyBytecodeTest.scala renamed to test/dotty/tools/backend/jvm/DottyBytecodeTest.scala

@@ -1,9 +1,9 @@
-package test
+package dotty.tools
+package backend.jvm
 
-import dotty.tools.dotc.core.Contexts.{Context, ContextBase}
-import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.backend.jvm.GenBCode
-import dotty.tools.dotc.Compiler
+import dotc.core.Contexts.{Context, ContextBase}
+import dotc.core.Phases.Phase
+import dotc.Compiler
 
 import scala.reflect.io.{VirtualDirectory => Directory}
 import scala.tools.asm
@@ -17,7 +17,7 @@ import scala.tools.asm.{ClassWriter, ClassReader}
 import scala.tools.asm.tree._
 import java.io.{File => JFile, InputStream}
 
-private[test] class TestGenBCode(val outDir: String) extends GenBCode {
+class TestGenBCode(val outDir: String) extends GenBCode {
   override def phaseName: String = "testGenBCode"
   val virtualDir = new Directory(outDir, None)
   override def outputDir(implicit ctx: Context) = virtualDir

test/test/DottyBytecodeTests.scala renamed to test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -1,4 +1,4 @@
-package test
+package dotty.tools.backend.jvm
 
 import org.junit.Assert._
 import org.junit.Test

test/test/InlineBytecodeTests.scala renamed to test/dotty/tools/backend/jvm/InlineBytecodeTests.scala

@@ -1,4 +1,4 @@
-package test
+package dotty.tools.backend.jvm
 
 import org.junit.Assert._
 import org.junit.Test

test/test/CompilerTest.scala renamed to test/dotty/tools/dotc/CompilerTest.scala

@@ -1,13 +1,13 @@
-package test
+package dotty.tools.dotc
 
-import dotty.tools.dotc.core.Contexts._
+import repl.TestREPL
+import core.Contexts._
 import dotty.partest.DPConfig
-import dotty.tools.dotc.{Main, Bench, Driver}
-import dotty.tools.dotc.interfaces.Diagnostic.ERROR
-import dotty.tools.dotc.reporting._
+import interfaces.Diagnostic.ERROR
+import reporting._
 import diagnostic.MessageContainer
-import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.dotc.config.CompilerCommand
+import util.SourcePosition
+import config.CompilerCommand
 import dotty.tools.io.PlainFile
 import scala.collection.mutable.ListBuffer
 import scala.reflect.io.{ Path, Directory, File => SFile, AbstractFile }

test/test/OtherEntryPointsTest.scala renamed to test/dotty/tools/dotc/EntryPointsTest.scala

@@ -1,12 +1,12 @@
-package test
+package dotty.tools
+package dotc
 
 import org.junit.Test
 import org.junit.Assert._
-import dotty.tools.dotc.Main
 import dotty.tools.dotc.interfaces.{CompilerCallback, SourceFile}
-import dotty.tools.dotc.reporting._
-import dotty.tools.dotc.reporting.diagnostic.MessageContainer
-import dotty.tools.dotc.core.Contexts._
+import reporting._
+import reporting.diagnostic.MessageContainer
+import core.Contexts._
 import java.io.File
 import scala.collection.mutable.ListBuffer
 
@@ -16,7 +16,7 @@ import scala.collection.mutable.ListBuffer
  *
  *  @see [[InterfaceEntryPointTest]]
  */
-class OtherEntryPointsTest {
+class EntryPointsTest {
   private val sources =
     List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
   private val dottyInterfaces =

test/test/InterfaceEntryPointTest.scala renamed to test/dotty/tools/dotc/InterfaceEntryPointTest.scala

@@ -1,8 +1,8 @@
-package test
+package dotty.tools.dotc
 
 import org.junit.Test
 import org.junit.Assert._
-import dotty.tools.dotc.interfaces._
+import interfaces._
 import scala.collection.mutable.ListBuffer
 
 /** Test that demonstrates how to use dotty-interfaces

test/dotty/tools/dotc/ast/TreeInfoTest.scala

@@ -1,8 +1,8 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package ast
 
 import org.junit.Test
-import test.DottyTest
 import core.Names._
 import core.Types._
 import core.Symbols._

test/test/DeSugarTest.scala renamed to test/dotty/tools/dotc/parsing/DeSugarTest.scala

@@ -1,11 +1,11 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
-import scala.reflect.io._
-import dotty.tools.dotc.util._
-import dotty.tools.dotc.core._
-import dotty.tools.dotc.parsing._
 import Tokens._, Parsers._
-import dotty.tools.dotc._
+import scala.reflect.io._
+import util._
+import core._
 import ast.Trees._
 import ast.desugar
 import ast.desugar._

test/test/DottyDocTest.scala renamed to test/dotty/tools/dotc/parsing/DocstringTest.scala

@@ -1,9 +1,11 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
-import dotty.tools.dotc.ast.Trees._
-import dotty.tools.dotc.core.Contexts.Context
+import ast.Trees._
+import core.Contexts.Context
 
-trait DottyDocTest extends DottyTest {
+trait DocstringTest extends DottyTest {
   ctx = ctx.fresh.setSetting(ctx.settings.YkeepComments, true)
 
   def checkDocString(actual: Option[String], expected: String): Unit = actual match {

test/test/DottyDocParsingTests.scala renamed to test/dotty/tools/dotc/parsing/DocstringTests.scala

@@ -1,12 +1,14 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.ast.Trees._
 
 import org.junit.Assert._
 import org.junit.Test
 
-class DottyDocParsingTests extends DottyDocTest {
+class DocstringTests extends DocstringTest {
 
   @Test def noComment = {
     import dotty.tools.dotc.ast.untpd._

test/test/ModifiersParsingTest.scala renamed to test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala

@@ -1,15 +1,17 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
 import org.junit.Test
 import org.junit.Assert._
 
-import dotty.tools.dotc.ast.untpd.modsDeco
-import dotty.tools.dotc.ast.untpd._
-import dotty.tools.dotc.ast.{ Trees => d }
-import dotty.tools.dotc.parsing.Parsers.Parser
-import dotty.tools.dotc.util.SourceFile
-import dotty.tools.dotc.core.Contexts.ContextBase
-import dotty.tools.dotc.core.Flags
+import ast.untpd.modsDeco
+import ast.untpd._
+import ast.{ Trees => d }
+import Parsers.Parser
+import util.SourceFile
+import core.Contexts.ContextBase
+import core.Flags
 
 object ModifiersParsingTest {
   implicit val ctx = (new ContextBase).initialCtx

test/test/ParserTest.scala renamed to test/dotty/tools/dotc/parsing/ParserTest.scala

@@ -1,12 +1,13 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
 import scala.reflect.io._
-import dotty.tools.dotc.util._
-import dotty.tools.dotc.core._
-import dotty.tools.dotc.parsing._
+import util._
+import core._
 import scala.io.Codec
 import Tokens._, Parsers._
-import dotty.tools.dotc.ast.untpd._
+import ast.untpd._
 import org.junit.Test
 import scala.collection.mutable.ListBuffer
 

test/test/ScannerTest.scala renamed to test/dotty/tools/dotc/parsing/ScannerTest.scala

@@ -1,9 +1,10 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
 import scala.reflect.io._
 import scala.io.Codec
-import dotty.tools.dotc.util._
-import dotty.tools.dotc.parsing._
+import util._
 import Tokens._, Scanners._
 import org.junit.Test
 

test/test/desugarPackage.scala renamed to test/dotty/tools/dotc/parsing/desugarPackage.scala

@@ -1,6 +1,7 @@
-package test
+package dotty.tools
+package dotc
+package parsing
 
-import dotty.tools.dotc._
 import core._, ast._
 import Trees._