From 551374065973b054c01148fd18efcbfd030dd351 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 30 Jun 2023 14:15:42 +0200 Subject: [PATCH] Minor, remove extraneous box tests These tests are already present in `compiler/testData/codegen/box/classes/kt496.kt`. --- ...LightTreeBlackBoxCodegenTestGenerated.java | 12 ---------- .../FirPsiBlackBoxCodegenTestGenerated.java | 12 ---------- .../tryCatchInExpressions/splitTryCorner1.kt | 11 ---------- .../tryCatchInExpressions/splitTryCorner2.kt | 22 ------------------- .../codegen/BlackBoxCodegenTestGenerated.java | 12 ---------- .../IrBlackBoxCodegenTestGenerated.java | 12 ---------- ...kBoxCodegenWithIrInlinerTestGenerated.java | 12 ---------- .../LightAnalysisModeTestGenerated.java | 10 --------- .../fir/FirJsCodegenBoxTestGenerated.java | 12 ---------- .../test/ir/IrJsCodegenBoxTestGenerated.java | 12 ---------- .../ir/IrJsES6CodegenBoxTestGenerated.java | 12 ---------- .../FirNativeCodegenBoxTestGenerated.java | 12 ---------- .../FirNativeCodegenBoxTestNoPLGenerated.java | 12 ---------- .../NativeCodegenBoxTestGenerated.java | 12 ---------- .../NativeCodegenBoxTestNoPLGenerated.java | 12 ---------- .../test/FirWasmCodegenBoxTestGenerated.java | 12 ---------- .../test/K1WasmCodegenBoxTestGenerated.java | 12 ---------- 17 files changed, 211 deletions(-) delete mode 100644 compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt delete mode 100644 compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 2aaeb3ed6ff..d40c83c9e57 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -10060,18 +10060,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index c7bd3040727..2354d51e146 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -10060,18 +10060,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt deleted file mode 100644 index bbf5ad07064..00000000000 --- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt +++ /dev/null @@ -1,11 +0,0 @@ -fun shouldReturnFalse() : Boolean { - try { - return true - } finally { - if (true) - return false - } -} - -fun box(): String = - if (shouldReturnFalse()) "Failed" else "OK" \ No newline at end of file diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt deleted file mode 100644 index 7c0c3e81c55..00000000000 --- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt +++ /dev/null @@ -1,22 +0,0 @@ -fun shouldReturn11() : Int { - var x = 0 - while (true) { - try { - if(x < 10) - x++ - else - break - } - finally { - x++ - } - } - return x -} - -fun box(): String { - val test = shouldReturn11() - if (test != 11) return "Failed, test=$test" - - return "OK" -} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index b38f8302068..d8f39179db4 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -9802,18 +9802,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 243e43b64ac..aa9996e60ee 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -10060,18 +10060,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index eef54a9609b..6f09d6267f2 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -10060,18 +10060,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 891d54407aa..4781e80b662 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -7913,16 +7913,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @TestMetadata("try.kt") public void testTry() throws Exception { runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 97f2217658c..1ef1da332dc 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -6880,18 +6880,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index e2c39be9ded..400cc07f719 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -6880,18 +6880,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 490f7edbdfb..39801d2f3b8 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -6880,18 +6880,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index af03cbfdf8a..9172f27d76f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -7725,18 +7725,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 992983252cb..5c289f7a98b 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -7899,18 +7899,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index d28ca988eba..bd033240a28 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -7639,18 +7639,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index 5c5b225cd70..bb11add585c 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -7726,18 +7726,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java index 530ef5d2e48..990822430d5 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java @@ -6856,18 +6856,6 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 1f8755935b9..a6c1e24c668 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -6856,18 +6856,6 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); } - @Test - @TestMetadata("splitTryCorner1.kt") - public void testSplitTryCorner1() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); - } - - @Test - @TestMetadata("splitTryCorner2.kt") - public void testSplitTryCorner2() throws Exception { - runTest("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); - } - @Test @TestMetadata("try.kt") public void testTry() throws Exception {