From 66c278ff8d6f34febb7f39c20471a0eebe808a4f Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 3 Mar 2023 12:41:06 +0100 Subject: [PATCH] [JS][IC][test] Remove testBreakKlibBinaryCompatibilityWithVariance test #KT-57078 Fixed --- .../JsFirInvalidationTestGenerated.java | 5 ----- .../JsIrES6InvalidationTestGenerated.java | 5 ----- .../JsIrInvalidationTestGenerated.java | 5 ----- .../lib1/l1.0.kt | 5 ----- .../lib1/l1.1.kt | 5 ----- .../lib1/module.info | 9 --------- .../lib2/l2.0.kt | 5 ----- .../lib2/module.info | 8 -------- .../main/m.kt | 16 ---------------- .../main/module.info | 6 ------ .../project.info | 8 -------- 11 files changed, 77 deletions(-) delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.0.kt delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.1.kt delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/module.info delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/l2.0.kt delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/module.info delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/m.kt delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/module.info delete mode 100644 js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/project.info diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java index 575c1320d44..91f1b618473 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java @@ -40,11 +40,6 @@ public class JsFirInvalidationTestGenerated extends AbstractJsFirInvalidationTes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false); } - @TestMetadata("breakKlibBinaryCompatibilityWithVariance") - public void testBreakKlibBinaryCompatibilityWithVariance() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/"); - } - @TestMetadata("circleExportsUpdate") public void testCircleExportsUpdate() throws Exception { runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java index a590d5d7420..85cba73d4de 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java @@ -40,11 +40,6 @@ public class JsIrES6InvalidationTestGenerated extends AbstractJsIrES6Invalidatio KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR_ES6, false); } - @TestMetadata("breakKlibBinaryCompatibilityWithVariance") - public void testBreakKlibBinaryCompatibilityWithVariance() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/"); - } - @TestMetadata("circleExportsUpdate") public void testCircleExportsUpdate() throws Exception { runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java index 2db7d7075ba..83a06df9951 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java @@ -40,11 +40,6 @@ public class JsIrInvalidationTestGenerated extends AbstractJsIrInvalidationTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false); } - @TestMetadata("breakKlibBinaryCompatibilityWithVariance") - public void testBreakKlibBinaryCompatibilityWithVariance() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/"); - } - @TestMetadata("circleExportsUpdate") public void testCircleExportsUpdate() throws Exception { runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/"); diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.0.kt b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.0.kt deleted file mode 100644 index 9fe43152ef6..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.0.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface GenericInterface - -interface TestInterface { - fun test(f: () -> GenericInterface) {} -} diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.1.kt b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.1.kt deleted file mode 100644 index fcd9728dba2..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/l1.1.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface GenericInterface - -interface TestInterface { - fun test(f: () -> GenericInterface) {} -} diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/module.info b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/module.info deleted file mode 100644 index cfe5f544e59..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib1/module.info +++ /dev/null @@ -1,9 +0,0 @@ -STEP 0: - modifications: - U : l1.0.kt -> l1.kt - added file: l1.kt -STEP 1: - modifications: - U : l1.1.kt -> l1.kt - modified ir: l1.kt - updated exports: l1.kt diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/l2.0.kt b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/l2.0.kt deleted file mode 100644 index 2991eeecc73..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/l2.0.kt +++ /dev/null @@ -1,5 +0,0 @@ -class TestClass : TestInterface { - override fun test(f: () -> GenericInterface) { - f() - } -} diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/module.info b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/module.info deleted file mode 100644 index ee248f0e59d..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/lib2/module.info +++ /dev/null @@ -1,8 +0,0 @@ -STEP 0: - dependencies: lib1 - modifications: - U : l2.0.kt -> l2.kt - added file: l2.kt -STEP 1: - rebuild klib: false - updated imports: l2.kt diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/m.kt b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/m.kt deleted file mode 100644 index 94857eabb73..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/m.kt +++ /dev/null @@ -1,16 +0,0 @@ -fun box(stepId: Int): String { - var x = -1 - TestClass().test { - object : GenericInterface { - init { - x = stepId - } - } - } - - when (stepId) { - in 0..1 -> if (x != stepId) return "Fail, got $x" - else -> return "Unknown" - } - return "OK" -} diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/module.info b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/module.info deleted file mode 100644 index a7fcdfeed8d..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/main/module.info +++ /dev/null @@ -1,6 +0,0 @@ -STEP 0: - dependencies: lib1, lib2 - added file: m.kt -STEP 1: - dependencies: lib1, lib2 - updated imports: m.kt diff --git a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/project.info b/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/project.info deleted file mode 100644 index 446b4d0374c..00000000000 --- a/js/js.translator/testData/incremental/invalidation/breakKlibBinaryCompatibilityWithVariance/project.info +++ /dev/null @@ -1,8 +0,0 @@ -MODULES: lib1, lib2, main - -STEP 0: - libs: lib1, lib2, main - dirty js: lib1, lib2, main -STEP 1: - libs: lib1, lib2, main - dirty js: lib1, lib2, main