From 6265ac8c198a39aa536b4f976b95833098cd03bf Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 29 Jan 2021 22:01:19 +0300 Subject: [PATCH] Re-enabled disabled test --- ...FakeOverride.kt.disabled => newFakeOverride.kt} | 14 +------------- .../JsKlibBinaryCompatibilityTestGenerated.java | 5 +++++ 2 files changed, 6 insertions(+), 13 deletions(-) rename compiler/testData/binaryCompatibility/klibEvolution/{newFakeOverride.kt.disabled => newFakeOverride.kt} (75%) diff --git a/compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt.disabled b/compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt similarity index 75% rename from compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt.disabled rename to compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt index ef0dc94f9aa..1957d894f76 100644 --- a/compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt.disabled +++ b/compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt @@ -2,15 +2,12 @@ // FILE: A.kt // VERSION: 1 -open class X { - val hasFoo = false -} +open class X // FILE: B.kt // VERSION: 2 open class X { - val hasFoo = false open fun foo(): String = "new member" } @@ -33,15 +30,6 @@ fun qux(): String = Y().foo() // MODULE: mainLib(lib) // FILE: mainLib.kt -fun qux(): String { - val y = Y() - if (y.hasFoo()) { - foo() - } else { - "no foo" - } -} - fun lib(): String = when { qux() != "new member" -> "fail 1" diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java index 4a7bac2c5ad..d5862b67e21 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java @@ -175,6 +175,11 @@ public class JsKlibBinaryCompatibilityTestGenerated extends AbstractJsKlibBinary runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt"); } + @TestMetadata("newFakeOverride.kt") + public void testNewFakeOverride() throws Exception { + runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt"); + } + @TestMetadata("newOverrideMember.kt") public void testNewOverrideMember() throws Exception { runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt");