Separate object init tests from class init tests

scala · Apr 6, 2023 · 9644cf5 · 9644cf5
1 parent 74b629f
commit 9644cf5
Show file tree

Hide file tree

Showing 59 changed files with 21 additions and 1 deletion.
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -266,6 +266,14 @@ class CompilationTests {
     compileFilesInDir("tests/explicit-nulls/run", explicitNullsOptions)
   }.checkRuns()
 
+  // initialization tests
+  @Test def checkInitGlobal: Unit = {
+    implicit val testGroup: TestGroup = TestGroup("checkInitGlobal")
+    val options = defaultOptions.and("-Ysafe-init-global", "-Xfatal-warnings")
+    compileFilesInDir("tests/init-global/neg", options).checkExpectedErrors()
+    compileFilesInDir("tests/init-global/pos", options).checkCompile()
+  }
+
   // initialization tests
   @Test def checkInit: Unit = {
     implicit val testGroup: TestGroup = TestGroup("checkInit")

diff --git a/tests/init/neg/context-sensitivity.scala → ...init-global/neg/context-sensitivity.scala b/tests/init/neg/context-sensitivity.scala → ...init-global/neg/context-sensitivity.scala
diff --git a/tests/init/neg/global-by-name.scala → tests/init-global/neg/global-by-name.scala b/tests/init/neg/global-by-name.scala → tests/init-global/neg/global-by-name.scala
diff --git a/tests/init/neg/global-cycle1.check → tests/init-global/neg/global-cycle1.check b/tests/init/neg/global-cycle1.check → tests/init-global/neg/global-cycle1.check
diff --git a/tests/init/neg/global-cycle1.scala → tests/init-global/neg/global-cycle1.scala b/tests/init/neg/global-cycle1.scala → tests/init-global/neg/global-cycle1.scala
diff --git a/tests/init/neg/global-cycle14.scala → tests/init-global/neg/global-cycle14.scala b/tests/init/neg/global-cycle14.scala → tests/init-global/neg/global-cycle14.scala
diff --git a/tests/init/neg/global-cycle5.scala → tests/init-global/neg/global-cycle5.scala b/tests/init/neg/global-cycle5.scala → tests/init-global/neg/global-cycle5.scala
diff --git a/tests/init/neg/global-cycle6.scala → tests/init-global/neg/global-cycle6.scala b/tests/init/neg/global-cycle6.scala → tests/init-global/neg/global-cycle6.scala
diff --git a/tests/init/neg/global-cycle7.scala → tests/init-global/neg/global-cycle7.scala b/tests/init/neg/global-cycle7.scala → tests/init-global/neg/global-cycle7.scala
diff --git a/tests/init/neg/global-cycle8.scala → tests/init-global/neg/global-cycle8.scala b/tests/init/neg/global-cycle8.scala → tests/init-global/neg/global-cycle8.scala
diff --git a/tests/init/neg/global-fun.scala → tests/init-global/neg/global-fun.scala b/tests/init/neg/global-fun.scala → tests/init-global/neg/global-fun.scala
diff --git a/tests/init/neg/global-irrelevance1.scala → ...init-global/neg/global-irrelevance1.scala b/tests/init/neg/global-irrelevance1.scala → ...init-global/neg/global-irrelevance1.scala
diff --git a/tests/init/neg/global-irrelevance2.scala → ...init-global/neg/global-irrelevance2.scala b/tests/init/neg/global-irrelevance2.scala → ...init-global/neg/global-irrelevance2.scala
diff --git a/tests/init/neg/global-irrelevance3.scala → ...init-global/neg/global-irrelevance3.scala b/tests/init/neg/global-irrelevance3.scala → ...init-global/neg/global-irrelevance3.scala
diff --git a/tests/init/neg/global-irrelevance4.scala → ...init-global/neg/global-irrelevance4.scala b/tests/init/neg/global-irrelevance4.scala → ...init-global/neg/global-irrelevance4.scala
diff --git a/tests/init/neg/global-irrelevance5.scala → ...init-global/neg/global-irrelevance5.scala b/tests/init/neg/global-irrelevance5.scala → ...init-global/neg/global-irrelevance5.scala
diff --git a/tests/init/neg/global-irrelevance6.scala → ...init-global/neg/global-irrelevance6.scala b/tests/init/neg/global-irrelevance6.scala → ...init-global/neg/global-irrelevance6.scala
diff --git a/tests/init/neg/global-irrelevance7.scala → ...init-global/neg/global-irrelevance7.scala b/tests/init/neg/global-irrelevance7.scala → ...init-global/neg/global-irrelevance7.scala
diff --git a/tests/init/neg/global-list.scala → tests/init-global/neg/global-list.scala b/tests/init/neg/global-list.scala → tests/init-global/neg/global-list.scala
diff --git a/tests/init/neg/global-region1.scala → tests/init-global/neg/global-region1.scala b/tests/init/neg/global-region1.scala → tests/init-global/neg/global-region1.scala
diff --git a/tests/init/neg/global-this.scala → tests/init-global/neg/global-this.scala b/tests/init/neg/global-this.scala → tests/init-global/neg/global-this.scala
diff --git a/tests/init/neg/i11262.scala → tests/init-global/neg/i11262.scala b/tests/init/neg/i11262.scala → tests/init-global/neg/i11262.scala
diff --git a/tests/init/neg/i12544b.scala → tests/init-global/neg/i12544b.scala b/tests/init/neg/i12544b.scala → tests/init-global/neg/i12544b.scala
diff --git a/tests/init/neg/i9176.scala → tests/init-global/neg/i9176.scala b/tests/init/neg/i9176.scala → tests/init-global/neg/i9176.scala
diff --git a/tests/init/neg/mutable-read1.scala → tests/init-global/neg/mutable-read1.scala b/tests/init/neg/mutable-read1.scala → tests/init-global/neg/mutable-read1.scala
diff --git a/tests/init/neg/mutable-read2.scala → tests/init-global/neg/mutable-read2.scala b/tests/init/neg/mutable-read2.scala → tests/init-global/neg/mutable-read2.scala
diff --git a/tests/init/neg/mutable-read3.scala → tests/init-global/neg/mutable-read3.scala b/tests/init/neg/mutable-read3.scala → tests/init-global/neg/mutable-read3.scala
diff --git a/tests/init/neg/mutable-read4.scala → tests/init-global/neg/mutable-read4.scala b/tests/init/neg/mutable-read4.scala → tests/init-global/neg/mutable-read4.scala
diff --git a/tests/init/neg/mutable-read5.scala → tests/init-global/neg/mutable-read5.scala b/tests/init/neg/mutable-read5.scala → tests/init-global/neg/mutable-read5.scala
diff --git a/tests/init/neg/mutable-read6.scala → tests/init-global/neg/mutable-read6.scala b/tests/init/neg/mutable-read6.scala → tests/init-global/neg/mutable-read6.scala
diff --git a/tests/init/neg/mutable-read7.scala → tests/init-global/neg/mutable-read7.scala b/tests/init/neg/mutable-read7.scala → tests/init-global/neg/mutable-read7.scala
diff --git a/tests/init/neg/mutable-read8.scala → tests/init-global/neg/mutable-read8.scala b/tests/init/neg/mutable-read8.scala → tests/init-global/neg/mutable-read8.scala
diff --git a/tests/init/neg/partial-ordering.scala → tests/init-global/neg/partial-ordering.scala b/tests/init/neg/partial-ordering.scala → tests/init-global/neg/partial-ordering.scala
diff --git a/tests/init/neg/t5366.scala → tests/init-global/neg/t5366.scala b/tests/init/neg/t5366.scala → tests/init-global/neg/t5366.scala
diff --git a/tests/init/neg/t9115.scala → tests/init-global/neg/t9115.scala b/tests/init/neg/t9115.scala → tests/init-global/neg/t9115.scala
diff --git a/tests/init/neg/t9261.scala → tests/init-global/neg/t9261.scala b/tests/init/neg/t9261.scala → tests/init-global/neg/t9261.scala
diff --git a/tests/init/neg/t9312.scala → tests/init-global/neg/t9312.scala b/tests/init/neg/t9312.scala → tests/init-global/neg/t9312.scala
diff --git a/tests/init/neg/t9360.scala → tests/init-global/neg/t9360.scala b/tests/init/neg/t9360.scala → tests/init-global/neg/t9360.scala
diff --git a/tests/init/pos/global-by-name.scala → tests/init-global/pos/global-by-name.scala b/tests/init/pos/global-by-name.scala → tests/init-global/pos/global-by-name.scala
diff --git a/tests/init/pos/global-cycle10.scala → tests/init-global/pos/global-cycle10.scala b/tests/init/pos/global-cycle10.scala → tests/init-global/pos/global-cycle10.scala
diff --git a/tests/init/pos/global-cycle11.scala → tests/init-global/pos/global-cycle11.scala b/tests/init/pos/global-cycle11.scala → tests/init-global/pos/global-cycle11.scala
diff --git a/tests/init/pos/global-cycle12.scala → tests/init-global/pos/global-cycle12.scala b/tests/init/pos/global-cycle12.scala → tests/init-global/pos/global-cycle12.scala
diff --git a/tests/init/pos/global-cycle2.scala → tests/init-global/pos/global-cycle2.scala b/tests/init/pos/global-cycle2.scala → tests/init-global/pos/global-cycle2.scala
diff --git a/tests/init/pos/global-cycle3.scala → tests/init-global/pos/global-cycle3.scala b/tests/init/pos/global-cycle3.scala → tests/init-global/pos/global-cycle3.scala
diff --git a/tests/init/pos/global-cycle4.scala → tests/init-global/pos/global-cycle4.scala b/tests/init/pos/global-cycle4.scala → tests/init-global/pos/global-cycle4.scala
diff --git a/tests/init/pos/global-cycle9.scala → tests/init-global/pos/global-cycle9.scala b/tests/init/pos/global-cycle9.scala → tests/init-global/pos/global-cycle9.scala
diff --git a/tests/init/pos/global-fun.scala → tests/init-global/pos/global-fun.scala b/tests/init/pos/global-fun.scala → tests/init-global/pos/global-fun.scala
diff --git a/tests/init/pos/global-instantiation.scala → ...nit-global/pos/global-instantiation.scala b/tests/init/pos/global-instantiation.scala → ...nit-global/pos/global-instantiation.scala
diff --git a/tests/init/pos/global-local-var.scala → tests/init-global/pos/global-local-var.scala b/tests/init/pos/global-local-var.scala → tests/init-global/pos/global-local-var.scala
diff --git a/tests/init/pos/global-read.scala → tests/init-global/pos/global-read.scala b/tests/init/pos/global-read.scala → tests/init-global/pos/global-read.scala
diff --git a/tests/init/pos/global-recursion.scala → tests/init-global/pos/global-recursion.scala b/tests/init/pos/global-recursion.scala → tests/init-global/pos/global-recursion.scala
diff --git a/tests/init/pos/global-recursion2.scala → ...s/init-global/pos/global-recursion2.scala b/tests/init/pos/global-recursion2.scala → ...s/init-global/pos/global-recursion2.scala
diff --git a/tests/init/pos/global-region1.scala → tests/init-global/pos/global-region1.scala b/tests/init/pos/global-region1.scala → tests/init-global/pos/global-region1.scala
diff --git a/tests/init/pos/global-trivial-cycle.scala → ...nit-global/pos/global-trivial-cycle.scala b/tests/init/pos/global-trivial-cycle.scala → ...nit-global/pos/global-trivial-cycle.scala
diff --git a/tests/init/pos/global-val-owner.scala → tests/init-global/pos/global-val-owner.scala b/tests/init/pos/global-val-owner.scala → tests/init-global/pos/global-val-owner.scala
diff --git a/tests/init/pos/global-val-owner2.scala → ...s/init-global/pos/global-val-owner2.scala b/tests/init/pos/global-val-owner2.scala → ...s/init-global/pos/global-val-owner2.scala
diff --git a/tests/init/pos/tree-counter.scala → tests/init-global/pos/tree-counter.scala b/tests/init/pos/tree-counter.scala → tests/init-global/pos/tree-counter.scala
diff --git a/tests/init/neg/i12544.scala b/tests/init/neg/i12544.scala
@@ -5,7 +5,7 @@ enum Enum:
 def g(b: Enum.B): Int = b.foo()
 
 object Enum:
-  object nested:               // error
+  object nested:
     val a: Enum = Case
 
   val b: Enum = f(nested.a)

diff --git a/tests/init/pos/i12544.scala b/tests/init/pos/i12544.scala
@@ -0,0 +1,12 @@
+enum Enum:
+  case Case
+
+object Enum:
+  object nested:
+    val a: Enum = Case
+
+  val b: Enum = f(nested.a)
+
+  def f(e: Enum): Enum = e
+
+@main def main(): Unit = println(Enum.b)