From 3374ac7606078b1caa686443f7837b3b30379803 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 30 Nov 2015 17:42:36 +0300 Subject: [PATCH] Minor: More tests for warnings suppression --- ...uppressWarningsOnAnonymousObjectInVariable.kt | 4 ++++ ...ppressWarningsOnAnonymousObjectInVariable.txt | 3 +++ .../allWarnings/suppressWarningsOnFile.kt | 7 +++++++ .../allWarnings/suppressWarningsOnFile.txt | 16 ++++++++++++++++ .../checkers/DiagnosticsTestGenerated.java | 12 ++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.kt create mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.txt create mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.kt create mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.txt diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.kt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.kt new file mode 100644 index 00000000000..d623e09277f --- /dev/null +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.kt @@ -0,0 +1,4 @@ +@Suppress("warnings") +val anonymous = object { + fun foo(p: String?? = "" as String) {} +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.txt new file mode 100644 index 00000000000..56035455f77 --- /dev/null +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.txt @@ -0,0 +1,3 @@ +package + +@kotlin.Suppress(names = {"warnings"}) public val anonymous: kotlin.Any diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.kt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.kt new file mode 100644 index 00000000000..463e8a93fa4 --- /dev/null +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.kt @@ -0,0 +1,7 @@ +@file:Suppress("warnings") + +class C { + companion object { + val foo: String?? = null as Nothing? + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.txt new file mode 100644 index 00000000000..66cbd7a4563 --- /dev/null +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.txt @@ -0,0 +1,16 @@ +package + +public final class C { + public constructor C() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + + public companion object Companion { + private constructor Companion() + public final val foo: kotlin.String? = null + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + } +} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index c36a50ce7af..ca50d4142cd 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -16376,6 +16376,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("suppressWarningsOnAnonymousObjectInVariable.kt") + public void testSuppressWarningsOnAnonymousObjectInVariable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnAnonymousObjectInVariable.kt"); + doTest(fileName); + } + @TestMetadata("suppressWarningsOnClass.kt") public void testSuppressWarningsOnClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.kt"); @@ -16394,6 +16400,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("suppressWarningsOnFile.kt") + public void testSuppressWarningsOnFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFile.kt"); + doTest(fileName); + } + @TestMetadata("suppressWarningsOnFunction.kt") public void testSuppressWarningsOnFunction() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.kt");