From 8dc4fa62acf204e4cf9d4b2083a8031b70e9e455 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 29 Mar 2017 12:41:58 +0300 Subject: [PATCH] Minor, drop unused directive and test The directive was only used in this test and it had no effect on the behavior of the test. The test is removed because it's equivalent to simple.kt in the same directory --- .../memberHidesSupertypeOverride/simple1.0.kt | 21 ----------- .../simple1.0.txt | 36 ------------------- .../kotlin/checkers/BaseDiagnosticsTest.kt | 8 ++--- .../checkers/DiagnosticsTestGenerated.java | 6 ---- 4 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.kt delete mode 100644 compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.txt diff --git a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.kt deleted file mode 100644 index e8121bf56ba..00000000000 --- a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.kt +++ /dev/null @@ -1,21 +0,0 @@ -// !LANGUAGE_VERSION: 1.0 - -public interface Base { - fun getValue(): String - - fun test() = getValue() -} - -class Delegate : Base { - override fun getValue() = "Delegate" -} - -public abstract class MyClass : Base { - override fun test(): String { - return "Class" - } -} - -class A : MyClass(), Base by Delegate() { - override fun getValue() = "Delegate" -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.txt deleted file mode 100644 index 1355d6b325d..00000000000 --- a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.txt +++ /dev/null @@ -1,36 +0,0 @@ -package - -public final class A : MyClass, Base { - public constructor A() - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*2*/ fun getValue(): kotlin.String - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*delegation*/ fun test(): kotlin.String - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Base { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun getValue(): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open fun test(): kotlin.String - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Delegate : Base { - public constructor Delegate() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun getValue(): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun test(): kotlin.String - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public abstract class MyClass : Base { - public constructor MyClass() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun getValue(): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ fun test(): kotlin.String - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt index 4d25012280a..b3b82b88630 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt @@ -279,7 +279,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava): LanguageVersionSettings? { val apiVersionString = directiveMap[API_VERSION_DIRECTIVE] val directives = directiveMap[LANGUAGE_DIRECTIVE] - val languageVersionDirective = directiveMap[LANGUAGE_VERSION] - if (apiVersionString == null && directives == null && languageVersionDirective == null) return null + if (apiVersionString == null && directives == null) return null val apiVersion = (if (apiVersionString != null) ApiVersion.parse(apiVersionString) else ApiVersion.LATEST_STABLE) ?: error("Unknown API version: $apiVersionString") val languageFeatures = directives?.let(this::collectLanguageFeatureMap).orEmpty() - val languageVersion: LanguageVersion = languageVersionDirective?.let { LanguageVersion.fromVersionString(it) } ?: LanguageVersion.LATEST_STABLE - - return DiagnosticTestLanguageVersionSettings(languageFeatures, apiVersion, languageVersion) + return DiagnosticTestLanguageVersionSettings(languageFeatures, apiVersion, LanguageVersion.LATEST_STABLE) } private fun collectLanguageFeatureMap(directives: String): Map { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index abb9b090455..77a6529d85c 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -6270,12 +6270,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } - @TestMetadata("simple1.0.kt") - public void testSimple1_0() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple1.0.kt"); - doTest(fileName); - } - @TestMetadata("simpleNoOverride.kt") public void testSimpleNoOverride() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.kt");