From 93bb0c2d46f2e7416bed8c56ec77c92c93521fd3 Mon Sep 17 00:00:00 2001 From: Szymon Rodziewicz Date: Wed, 24 Jan 2024 14:07:04 +0100 Subject: [PATCH] Fix tests after rebase --- .../dotty/tools/dotc/CompilationTests.scala | 2 -- tests/neg-scalajs/enumeration-warnings.scala | 28 +++++++++---------- tests/patmat/i14407.dupe.check | 1 - tests/run/getclass.check | 4 +-- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 0b9063474e62..95b5362d77c0 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -216,8 +216,6 @@ class CompilationTests { @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() compileFilesInDir("tests/init-global/neg", options, FileFilter.exclude(TestSources.negInitGlobalScala2LibraryTastyBlacklisted)).checkExpectedErrors() compileFilesInDir("tests/init-global/warn", defaultOptions.and("-Ysafe-init-global"), FileFilter.exclude(TestSources.negInitGlobalScala2LibraryTastyBlacklisted)).checkWarnings() compileFilesInDir("tests/init-global/pos", options, FileFilter.exclude(TestSources.posInitGlobalScala2LibraryTastyBlacklisted)).checkCompile() diff --git a/tests/neg-scalajs/enumeration-warnings.scala b/tests/neg-scalajs/enumeration-warnings.scala index 10536fef4ba6..70ce08981dca 100644 --- a/tests/neg-scalajs/enumeration-warnings.scala +++ b/tests/neg-scalajs/enumeration-warnings.scala @@ -3,37 +3,35 @@ class UnableToTransformValue extends Enumeration { val a = { println("oh, oh!") - Value // warn + Value // error } val b = { println("oh, oh!") - Value(4) // warn + Value(4) // error } } class ValueWithNullName extends Enumeration { - val a = Value(null) // warn - val b = Value(10, null) // warn + val a = Value(null) // error + val b = Value(10, null) // error } class NewValWithNoName extends Enumeration { - val a = new Val // warn - val b = new Val(10) // warn + val a = new Val // error + val b = new Val(10) // error } class NewValWithNullName extends Enumeration { - val a = new Val(null) // warn - val b = new Val(10, null) // warn + val a = new Val(null) // error + val b = new Val(10, null) // error } class ExtendsValWithNoName extends Enumeration { - protected class Val1 extends Val // warn - protected class Val2 extends Val(1) // warn + protected class Val1 extends Val // error + protected class Val2 extends Val(1) // error } class ExtendsValWithNullName extends Enumeration { - protected class Val1 extends Val(null) // warn - protected class Val2 extends Val(1, null) // warn -} - -// nopos-error: No warnings can be incurred under -Werror. + protected class Val1 extends Val(null) // error + protected class Val2 extends Val(1, null) // error +} \ No newline at end of file diff --git a/tests/patmat/i14407.dupe.check b/tests/patmat/i14407.dupe.check index e6f742314d98..b0605bcd95e5 100644 --- a/tests/patmat/i14407.dupe.check +++ b/tests/patmat/i14407.dupe.check @@ -1,2 +1 @@ 6: Match case Unreachable -0: No Kind diff --git a/tests/run/getclass.check b/tests/run/getclass.check index f5f412ab2edc..ea73f6127c8f 100644 --- a/tests/run/getclass.check +++ b/tests/run/getclass.check @@ -22,5 +22,5 @@ class [D class [Lscala.collection.immutable.List; Functions: -class Test$$$Lambda/ -class Test$$$Lambda/ +class Test$$$Lambda$ +class Test$$$Lambda$