Move -sourcepath tests

smarter · smarter · commit 1907b49d4bd0 · 2019-12-04T18:19:40.000+01:00
Move -sourcepath tests so that the directory passed to
-sourcepath does not contain any unrelated files.
diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -131,7 +131,7 @@ object SymbolLoaders {
             ctx.warning(i"""$what ${tree.name} is in the wrong directory.
                            |It was declared to be in package ${path.reverse.mkString(".")}
                            |But it is found in directory     ${filePath.reverse.mkString(File.separator)}""",
-              tree.sourcePos)
+              tree.sourcePos.focus)
           ok
         }
 
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -39,10 +39,10 @@ class CompilationTests extends ParallelTesting {
       compileFile("tests/pos-scala2/rewrites.scala", scala2CompatMode.and("-rewrite")).copyToTarget(),
       compileFile("tests/pos-special/utf8encoded.scala", explicitUTF8),
       compileFile("tests/pos-special/utf16encoded.scala", explicitUTF16),
-      compileFile("tests/pos-special/completeFromSource/Test.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
-      compileFile("tests/pos-special/completeFromSource/Test2.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
-      compileFile("tests/pos-special/completeFromSource/Test3.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
-      compileFile("tests/pos-special/completeFromSource/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
+      compileFile("tests/pos-special/sourcepath/outer/Test.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+      compileFile("tests/pos-special/sourcepath/outer/Test2.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+      compileFile("tests/pos-special/sourcepath/outer/Test3.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+      compileFile("tests/pos-special/sourcepath/outer/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
       compileFilesInDir("tests/pos-special/fatal-warnings", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions),
       compileFilesInDir("tests/pos-special/strawman-collections", defaultOptions),
@@ -135,7 +135,8 @@ class CompilationTests extends ParallelTesting {
       compileFilesInDir("tests/neg-custom-args/isInstanceOf", allowDeepSubtypes and "-Xfatal-warnings"),
       compileFile("tests/neg-custom-args/i3627.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/matchtype-loop.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/completeFromSource/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args")),
+      compileFile("tests/neg-custom-args/sourcepath/outer/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath")),
+      compileDir("tests/neg-custom-args/sourcepath2/hi", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath2", "-Xfatal-warnings")),
       compileList("duplicate source", List(
         "tests/neg-custom-args/toplevel-samesource/S.scala",
         "tests/neg-custom-args/toplevel-samesource/nested/S.scala"),
diff --git a/tests/neg-custom-args/sourcepath/outer/nested/D.java b/tests/neg-custom-args/sourcepath/outer/nested/D.java
@@ -1,4 +1,4 @@
-package completeFromSource.nested;
+package outer.nested;
 
 public class D {
     public D(int i) {
diff --git a/tests/neg-custom-args/sourcepath/outer/nested/Test1.scala b/tests/neg-custom-args/sourcepath/outer/nested/Test1.scala
@@ -1,4 +1,4 @@
-package completeFromSource.nested
+package outer.nested
 
 class Test4 {
 
diff --git a/tests/neg-custom-args/sourcepath2/hi/A.check b/tests/neg-custom-args/sourcepath2/hi/A.check
@@ -0,0 +1,6 @@
+-- Error: tests/neg-custom-args/sourcepath2/hi/A.scala:3:6 -------------------------------------------------------------
+3 |class Hello { // error
+  |      ^
+  |      class Hello is in the wrong directory.
+  |      It was declared to be in package <empty>
+  |      But it is found in directory     hi
diff --git a/tests/neg-custom-args/sourcepath2/hi/A.scala b/tests/neg-custom-args/sourcepath2/hi/A.scala
@@ -0,0 +1,5 @@
+// Missing `package hi`
+
+class Hello { // error
+  val x: Int = 1
+}
diff --git a/tests/neg-custom-args/sourcepath2/hi/B.scala b/tests/neg-custom-args/sourcepath2/hi/B.scala
@@ -0,0 +1,2 @@
+package hi
+class B
diff --git a/tests/pos-special/sourcepath/outer/Test.scala b/tests/pos-special/sourcepath/outer/Test.scala
@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 
 class Test extends nested.A(22) {
 
diff --git a/tests/pos-special/sourcepath/outer/Test2.scala b/tests/pos-special/sourcepath/outer/Test2.scala
@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 import nested._
 
 class Test2 extends A(22) {
diff --git a/tests/pos-special/sourcepath/outer/Test3.scala b/tests/pos-special/sourcepath/outer/Test3.scala
@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 import nested._
 
 class Test3 {
diff --git a/tests/pos-special/sourcepath/outer/nested/A.scala b/tests/pos-special/sourcepath/outer/nested/A.scala
@@ -1,4 +1,4 @@
-package completeFromSource.nested
+package outer.nested
 
 class A(y: Int) {
 
diff --git a/tests/pos-special/sourcepath/outer/nested/BC.scala b/tests/pos-special/sourcepath/outer/nested/BC.scala
@@ -1,4 +1,4 @@
-package completeFromSource.nested
+package outer.nested
 
 
 case class B(x: Int) extends A(x)
diff --git a/tests/pos-special/sourcepath/outer/nested/D.java b/tests/pos-special/sourcepath/outer/nested/D.java
@@ -1,4 +1,4 @@
-package completeFromSource.nested;
+package outer.nested;
 
 public class D {
     public D(int i) {
diff --git a/tests/pos-special/sourcepath/outer/nested/Test4.scala b/tests/pos-special/sourcepath/outer/nested/Test4.scala
@@ -1,4 +1,4 @@
-package completeFromSource.nested
+package outer.nested
 
 class Test4 {
 
diff --git a/tests/pos-special/sourcepath/outer/nested/toplevel1.scala b/tests/pos-special/sourcepath/outer/nested/toplevel1.scala
@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 package nested
 
 val one: Int = 1
diff --git a/tests/pos-special/sourcepath/outer/toplevel2.scala b/tests/pos-special/sourcepath/outer/toplevel2.scala
@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 import nested._
 
 object toplevel2 {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ object SymbolLoaders {`
`131`	`131`	`ctx.warning(i"""$what ${tree.name} is in the wrong directory.`
`132`	`132`	`\|It was declared to be in package ${path.reverse.mkString(".")}`
`133`	`133`	`\|But it is found in directory ${filePath.reverse.mkString(File.separator)}""",`
`134`		`- tree.sourcePos)`
	`134`	`+ tree.sourcePos.focus)`
`135`	`135`	`ok`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package completeFromSource.nested;`
	`1`	`+package outer.nested;`
`2`	`2`
`3`	`3`	`public class D {`
`4`	`4`	`public D(int i) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package completeFromSource.nested`
	`1`	`+package outer.nested`
`2`	`2`
`3`	`3`	`class Test4 {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package completeFromSource`
	`1`	`+package outer`
`2`	`2`
`3`	`3`	`class Test extends nested.A(22) {`
`4`	`4`