diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index dc3a6dc19af..6574c9ef1dd 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -22,7 +22,7 @@ import java.util.regex.Pattern; public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "oldLanguageVersions"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Nested diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java index ba89e8032d5..64e8d4ad4a3 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java @@ -22,7 +22,7 @@ import java.util.regex.Pattern; public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxInlineCodegenTest { @Test public void testAllFilesPresentInBoxInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "oldLanguageVersions"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Nested diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java index 57a684cefb8..8dc66fd9614 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java @@ -40,7 +40,7 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { @Test public void testAllFilesPresentInBytecodeText() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "oldLanguageVersions"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Test diff --git a/compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt b/compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt deleted file mode 100644 index 85da5fbe240..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt +++ /dev/null @@ -1,17 +0,0 @@ -// !LANGUAGE: -ProperForInArrayLoopRangeVariableAssignmentSemantic -// IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// WITH_RUNTIME -// IGNORE_BACKEND: JS - -fun box(): String { - var xs = intArrayOf(1, 2, 3) - var sum = 0 - for (x in xs) { - sum = sum * 10 + x - xs = intArrayOf(4, 5) - } - return if (sum == 15) "OK" else "Fail: $sum" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt b/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt deleted file mode 100644 index f119ed303d2..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt +++ /dev/null @@ -1,18 +0,0 @@ -// DONT_TARGET_EXACT_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// !LANGUAGE: -DataClassInheritance -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// IGNORE_BACKEND: JVM_IR - -data class Foo(val s: String) - -fun box(): String { - val f1 = Foo("OK") - val f2 = Foo("OK") - if (f1 != f2) return "Fail equals" - if (f1.hashCode() != f2.hashCode()) return "Fail hashCode" - if (f1.toString() != f2.toString() || f1.toString() != "Foo(s=OK)") return "Fail toString: $f1 $f2" - - return f1.s -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt b/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt deleted file mode 100644 index 88ff5984d07..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt +++ /dev/null @@ -1,24 +0,0 @@ -// DONT_TARGET_EXACT_BACKEND: WASM -// WASM_MUTE_REASON: BIG_ARITY -// !LANGUAGE: -FunctionTypesWithBigArity - -// This test does not make sense for JVM because a diagnostic is reported when function types with big arity are not available -// (see diagnostics/tests/sourceCompatibility/noBigFunctionTypes.kt) -// IGNORE_BACKEND: JVM, JVM_IR - -class A - -fun foo( - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A -): String = "OK" - -fun bar(x: Function30): String { - val a = A() - return x(a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a) -} - -fun box(): String { - return bar(::foo) -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/explicitEqualsCallNull.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/explicitEqualsCallNull.kt deleted file mode 100644 index aa0dd3479bf..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/explicitEqualsCallNull.kt +++ /dev/null @@ -1,34 +0,0 @@ -// TARGET_BACKEND: JVM -// !LANGUAGE: -ThrowNpeOnExplicitEqualsForBoxedNull -// IGNORE_BACKEND: JVM_IR -// ^ ThrowNpeOnExplicitEqualsForBoxedNull is introduced in 1.2. -// MODULE: lib -// FILE: JavaClass.java - -public class JavaClass { - - public Double minus0(){ - return -0.0; - } - - public Double plus0(){ - return 0.0; - } - - public Double null0(){ - return null; - } - -} - - -// MODULE: main(lib) -// FILE: b.kt - -fun box(): String { - val jClass = JavaClass() - - if (jClass.null0().equals(jClass.plus0())) return "fail 6" - if (jClass.minus0().equals(jClass.null0())) return "fail 7" - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt deleted file mode 100644 index e1a6605570b..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt +++ /dev/null @@ -1,27 +0,0 @@ -// !API_VERSION: 1.0 - -fun myEquals(a: Double?, b: Double?) = a == b - -fun myEquals1(a: Double?, b: Double) = a == b - -fun myEquals2(a: Double, b: Double?) = a == b - -fun myEquals0(a: Double, b: Double) = a == b - - -fun box(): String { - if (!myEquals(null, null)) return "fail 1" - if (myEquals(null, 0.0)) return "fail 2" - if (myEquals(0.0, null)) return "fail 3" - if (!myEquals(0.0, 0.0)) return "fail 4" - - if (myEquals1(null, 0.0)) return "fail 5" - if (!myEquals1(0.0, 0.0)) return "fail 6" - - if (myEquals2(0.0, null)) return "fail 7" - if (!myEquals2(0.0, 0.0)) return "fail 8" - - if (!myEquals0(0.0, 0.0)) return "fail 9" - - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt deleted file mode 100644 index bbe5a8ab196..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt +++ /dev/null @@ -1,27 +0,0 @@ -// !API_VERSION: 1.0 - -fun myNotEquals(a: Double?, b: Double?) = a != b - -fun myNotEquals1(a: Double?, b: Double) = a != b - -fun myNotEquals2(a: Double, b: Double?) = a != b - -fun myNotEquals0(a: Double, b: Double) = a != b - - -fun box(): String { - if (myNotEquals(null, null)) return "fail 1" - if (!myNotEquals(null, 0.0)) return "fail 2" - if (!myNotEquals(0.0, null)) return "fail 3" - if (myNotEquals(0.0, 0.0)) return "fail 4" - - if (!myNotEquals1(null, 0.0)) return "fail 5" - if (myNotEquals1(0.0, 0.0)) return "fail 6" - - if (!myNotEquals2(0.0, null)) return "fail 7" - if (myNotEquals2(0.0, 0.0)) return "fail 8" - - if (myNotEquals0(0.0, 0.0)) return "fail 9" - - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt deleted file mode 100644 index 24cd16fb594..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt +++ /dev/null @@ -1,27 +0,0 @@ -// !API_VERSION: 1.0 - -fun myEquals(a: Float?, b: Float?) = a == b - -fun myEquals1(a: Float?, b: Float) = a == b - -fun myEquals2(a: Float, b: Float?) = a == b - -fun myEquals0(a: Float, b: Float) = a == b - - -fun box(): String { - if (!myEquals(null, null)) return "fail 1" - if (myEquals(null, 0.0F)) return "fail 2" - if (myEquals(0.0F, null)) return "fail 3" - if (!myEquals(0.0F, 0.0F)) return "fail 4" - - if (myEquals1(null, 0.0F)) return "fail 5" - if (!myEquals1(0.0F, 0.0F)) return "fail 6" - - if (myEquals2(0.0F, null)) return "fail 7" - if (!myEquals2(0.0F, 0.0F)) return "fail 8" - - if (!myEquals0(0.0F, 0.0F)) return "fail 9" - - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt deleted file mode 100644 index ce2657cbe19..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt +++ /dev/null @@ -1,27 +0,0 @@ -// !API_VERSION: 1.0 - -fun myNotEquals(a: Float?, b: Float?) = a != b - -fun myNotEquals1(a: Float?, b: Float) = a != b - -fun myNotEquals2(a: Float, b: Float?) = a != b - -fun myNotEquals0(a: Float, b: Float) = a != b - - -fun box(): String { - if (myNotEquals(null, null)) return "fail 1" - if (!myNotEquals(null, 0.0F)) return "fail 2" - if (!myNotEquals(0.0F, null)) return "fail 3" - if (myNotEquals(0.0F, 0.0F)) return "fail 4" - - if (!myNotEquals1(null, 0.0F)) return "fail 5" - if (myNotEquals1(0.0F, 0.0F)) return "fail 6" - - if (!myNotEquals2(0.0F, null)) return "fail 7" - if (myNotEquals2(0.0F, 0.0F)) return "fail 8" - - if (myNotEquals0(0.0F, 0.0F)) return "fail 9" - - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt deleted file mode 100644 index 240f4758409..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt +++ /dev/null @@ -1,36 +0,0 @@ -// !LANGUAGE: -ProperIeee754Comparisons -// !API_VERSION: 1.0 -// IGNORE_BACKEND: NATIVE -// DONT_TARGET_EXACT_BACKEND: JS_IR -// DONT_TARGET_EXACT_BACKEND: JS_IR_ES6 - -fun box(): String { - val plusZero: Any = 0.0 - val minusZero: Any = -0.0 - val nullDouble: Double? = null - if (plusZero is Double) { - when (plusZero) { - nullDouble -> { - return "fail 1" - } - -0.0 -> { - return "fail 2" - } - else -> {} - } - - if (minusZero is Double) { - when (plusZero) { - nullDouble -> { - return "fail 3" - } - minusZero -> { - return "fail 4" - } - else -> {} - } - } - } - - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt b/compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt deleted file mode 100644 index 6db9a8bccea..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !API_VERSION: 1.0 - -fun box(): String { - val nullValue: Any? = null - val nullDouble: Double? = null - val minusZero: Any = -0.0 - if (nullValue is Double?) { - when (nullValue) { - -0.0 -> { - return "fail 1" - } - nullDouble -> {} - else -> return "fail 2" - } - - if (minusZero is Double) { - when (nullValue) { - minusZero -> { - return "fail 3" - } - nullDouble -> { - } - else -> return "fail 4" - } - } - - } - return "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt b/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt deleted file mode 100644 index 7930d4caa95..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt +++ /dev/null @@ -1,17 +0,0 @@ -// !LANGUAGE: -NullabilityAssertionOnExtensionReceiver -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// FILE: test.kt -private operator fun A.inc() = A() - -fun box(): String { - var aNull = A.n() - aNull++ - // NB no exception is thrown in language version 1.1 - return "OK" -} - -// FILE: A.java -public class A { - public static A n() { return null; } -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt b/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt deleted file mode 100644 index 32e4fb1942b..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !LANGUAGE: -NullabilityAssertionOnExtensionReceiver -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// FILE: test.kt - -import kotlin.test.* - -operator fun A.inc() = A() - -fun box(): String { - assertFailsWith { - var aNull = A.n() - aNull++ - } - - return "OK" -} - -// FILE: A.java -public class A { - public static A n() { return null; } -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt b/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt deleted file mode 100644 index 8751d513e31..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt +++ /dev/null @@ -1,17 +0,0 @@ -// !LANGUAGE: -NullabilityAssertionOnExtensionReceiver -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// FILE: test.kt -import kotlin.test.* - -fun String.extension() {} - -fun box(): String { - assertFailsWith { J.s().extension() } - return "OK" -} - -// FILE: J.java -public class J { - public static String s() { return null; } -} \ No newline at end of file diff --git a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt b/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt deleted file mode 100644 index 46f7045be64..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt +++ /dev/null @@ -1,17 +0,0 @@ -// !LANGUAGE: -NullabilityAssertionOnExtensionReceiver -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// FILE: test.kt -import kotlin.test.* - -inline fun String.extension() {} - -fun box(): String { - J.s().extension() // NB no exception thrown - return "OK" -} - -// FILE: J.java -public class J { - public static String s() { return null; } -} \ No newline at end of file diff --git a/compiler/testData/codegen/box/oldLanguageVersions/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt b/compiler/testData/codegen/box/oldLanguageVersions/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt deleted file mode 100644 index 5ee8a146904..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt +++ /dev/null @@ -1,11 +0,0 @@ -// !LANGUAGE: -ProhibitOperatorMod -// !API_VERSION: 1.0 -// TARGET_BACKEND: JVM -// FULL_JDK - -import java.math.BigInteger - -fun box(): String { - val m = BigInteger.valueOf(-2) % BigInteger.valueOf(3) - return if (m != BigInteger.valueOf(1)) "Fail: BigInteger(-2) mod BigInteger(3) == $m" else "OK" -} diff --git a/compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives/equalsNull_lv11.kt b/compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives/equalsNull_lv11.kt deleted file mode 100644 index a930ab8fe66..00000000000 --- a/compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives/equalsNull_lv11.kt +++ /dev/null @@ -1,39 +0,0 @@ -// !LANGUAGE: -ThrowNpeOnExplicitEqualsForBoxedNull -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// FILE: test.kt -import kotlin.test.* - -fun box(): String { - assertEquals(J.BOOL_NULL.equals(null), true) - assertEquals(J.CHAR_NULL.equals(null), true) - assertEquals(J.BYTE_NULL.equals(null), true) - assertEquals(J.SHORT_NULL.equals(null), true) - assertEquals(J.INT_NULL.equals(null), true) - assertEquals(J.LONG_NULL.equals(null), true) - assertEquals(J.FLOAT_NULL.equals(null), true) - assertEquals(J.DOUBLE_NULL.equals(null), true) - - assertEquals(J.BOOL_NULL == null, true) - assertEquals(J.CHAR_NULL == null, true) - assertEquals(J.BYTE_NULL == null, true) - assertEquals(J.SHORT_NULL == null, true) - assertEquals(J.INT_NULL == null, true) - assertEquals(J.LONG_NULL == null, true) - assertEquals(J.FLOAT_NULL == null, true) - assertEquals(J.DOUBLE_NULL == null, true) - - return "OK" -} - -// FILE: J.java -public class J { - public static Boolean BOOL_NULL = null; - public static Character CHAR_NULL = null; - public static Byte BYTE_NULL = null; - public static Short SHORT_NULL = null; - public static Integer INT_NULL = null; - public static Long LONG_NULL = null; - public static Float FLOAT_NULL = null; - public static Double DOUBLE_NULL = null; -} \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty/accessorsForPrivateConstants.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty/accessorsForPrivateConstants.kt deleted file mode 100644 index 67403ba71aa..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty/accessorsForPrivateConstants.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !LANGUAGE: -InlineConstVals -// IGNORE_BACKEND: JVM_IR -// FILE: Foo.kt - -private const val OUTER_PRIVATE = 20 - -class Foo { - companion object { - private const val LOCAL_PRIVATE = 20 - } - - fun foo() { - // Access to the property use getstatic on the backed field - LOCAL_PRIVATE - // Access to the property requires an invokestatic - OUTER_PRIVATE - } -} - -// 1 INVOKESTATIC -// 1 PUTSTATIC -// 2 GETSTATIC diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt deleted file mode 100644 index c85ee6793b9..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !API_VERSION: 1.0 - -fun myEquals(a: Double?, b: Double?) = a == b - -fun myEquals1(a: Double?, b: Double) = a == b - -fun myEquals2(a: Double, b: Double?) = a == b - -fun myEquals0(a: Double, b: Double) = a == b - - -fun box(): String { - if (!myEquals(null, null)) return "fail 1" - if (myEquals(null, 0.0)) return "fail 2" - if (myEquals(0.0, null)) return "fail 3" - if (!myEquals(0.0, 0.0)) return "fail 4" - - if (myEquals1(null, 0.0)) return "fail 5" - if (!myEquals1(0.0, 0.0)) return "fail 6" - - if (myEquals2(0.0, null)) return "fail 7" - if (!myEquals2(0.0, 0.0)) return "fail 8" - - if (!myEquals0(0.0, 0.0)) return "fail 9" - - return "OK" -} - -// 0 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt deleted file mode 100644 index eccf8822717..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !API_VERSION: 1.0 - -fun myNotEquals(a: Double?, b: Double?) = a != b - -fun myNotEquals1(a: Double?, b: Double) = a != b - -fun myNotEquals2(a: Double, b: Double?) = a != b - -fun myNotEquals0(a: Double, b: Double) = a != b - - -fun box(): String { - if (myNotEquals(null, null)) return "fail 1" - if (!myNotEquals(null, 0.0)) return "fail 2" - if (!myNotEquals(0.0, null)) return "fail 3" - if (myNotEquals(0.0, 0.0)) return "fail 4" - - if (!myNotEquals1(null, 0.0)) return "fail 5" - if (myNotEquals1(0.0, 0.0)) return "fail 6" - - if (!myNotEquals2(0.0, null)) return "fail 7" - if (myNotEquals2(0.0, 0.0)) return "fail 8" - - if (myNotEquals0(0.0, 0.0)) return "fail 9" - - return "OK" -} - -// 0 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatEquals10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatEquals10.kt deleted file mode 100644 index d362657b066..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatEquals10.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !API_VERSION: 1.0 - -fun myEquals(a: Float?, b: Float?) = a == b - -fun myEquals1(a: Float?, b: Float) = a == b - -fun myEquals2(a: Float, b: Float?) = a == b - -fun myEquals0(a: Float, b: Float) = a == b - - -fun box(): String { - if (!myEquals(null, null)) return "fail 1" - if (myEquals(null, 0.0F)) return "fail 2" - if (myEquals(0.0F, null)) return "fail 3" - if (!myEquals(0.0F, 0.0F)) return "fail 4" - - if (myEquals1(null, 0.0F)) return "fail 5" - if (!myEquals1(0.0F, 0.0F)) return "fail 6" - - if (myEquals2(0.0F, null)) return "fail 7" - if (!myEquals2(0.0F, 0.0F)) return "fail 8" - - if (!myEquals0(0.0F, 0.0F)) return "fail 9" - - return "OK" -} - -// 0 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt deleted file mode 100644 index fa42ff1511c..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !API_VERSION: 1.0 - -fun myNotEquals(a: Float?, b: Float?) = a != b - -fun myNotEquals1(a: Float?, b: Float) = a != b - -fun myNotEquals2(a: Float, b: Float?) = a != b - -fun myNotEquals0(a: Float, b: Float) = a != b - - -fun box(): String { - if (myNotEquals(null, null)) return "fail 1" - if (!myNotEquals(null, 0.0F)) return "fail 2" - if (!myNotEquals(0.0F, null)) return "fail 3" - if (myNotEquals(0.0F, 0.0F)) return "fail 4" - - if (!myNotEquals1(null, 0.0F)) return "fail 5" - if (myNotEquals1(0.0F, 0.0F)) return "fail 6" - - if (!myNotEquals2(0.0F, null)) return "fail 7" - if (myNotEquals2(0.0F, 0.0F)) return "fail 8" - - if (myNotEquals0(0.0F, 0.0F)) return "fail 9" - - return "OK" -} - -// 0 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForDouble10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForDouble10.kt deleted file mode 100644 index 75875819434..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForDouble10.kt +++ /dev/null @@ -1,24 +0,0 @@ -// !API_VERSION: 1.0 -// !LANGUAGE: -ProperIeee754Comparisons - -fun equals5(a: Any?, b: Any?) = if (a is Double && b is Double?) a == b else null!! - -fun equals6(a: Any?, b: Any?) = if (a is Double? && b is Double) a == b else null!! - -fun equals8(a: Any?, b: Any?) = if (a is Double? && b is Double?) a == b else null!! - - -fun box(): String { - if (!equals5(-0.0, 0.0)) return "fail 5" - if (!equals6(-0.0, 0.0)) return "fail 6" - - if (!equals8(-0.0, 0.0)) return "fail 8" - if (!equals8(null, null)) return "fail 9" - if (equals8(null, 0.0)) return "fail 10" - if (equals8(0.0, null)) return "fail 11" - - return "OK" -} - -// 3 areEqual \(Ljava/lang/Object;Ljava/lang/Object;\)Z -// 3 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForFloat10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForFloat10.kt deleted file mode 100644 index 7499ab00d36..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForFloat10.kt +++ /dev/null @@ -1,24 +0,0 @@ -// !API_VERSION: 1.0 -// !LANGUAGE: -ProperIeee754Comparisons - -fun equals5(a: Any?, b: Any?) = if (a is Float && b is Float?) a == b else null!! - -fun equals6(a: Any?, b: Any?) = if (a is Float? && b is Float) a == b else null!! - -fun equals8(a: Any?, b: Any?) = if (a is Float? && b is Float?) a == b else null!! - - -fun box(): String { - if (!equals5(-0.0F, 0.0F)) return "fail 5" - if (!equals6(-0.0F, 0.0F)) return "fail 6" - - if (!equals8(-0.0F, 0.0F)) return "fail 8" - if (!equals8(null, null)) return "fail 9" - if (equals8(null, 0.0F)) return "fail 10" - if (equals8(0.0F, null)) return "fail 11" - - return "OK" -} - -// 3 areEqual \(Ljava/lang/Object;Ljava/lang/Object;\)Z -// 3 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/when10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/when10.kt deleted file mode 100644 index ceb62e6dbe3..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/when10.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !API_VERSION: 1.0 -// !LANGUAGE: -ProperIeee754Comparisons - -fun box(): String { - val plusZero: Any = 0.0 - val minusZero: Any = -0.0 - val nullDouble: Double? = null - if (plusZero is Double) { - when (plusZero) { - nullDouble -> { - return "fail 1" - } - -0.0 -> { - } - else -> return "fail 2" - } - - if (minusZero is Double) { - when (plusZero) { - nullDouble -> { - return "fail 3" - } - minusZero -> { - } - else -> return "fail 4" - } - } - } - - return "OK" -} - -// 4 areEqual \(Ljava/lang/Object;Ljava/lang/Object;\)Z -// 4 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt deleted file mode 100644 index 2446ec3b043..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt +++ /dev/null @@ -1,33 +0,0 @@ -// !API_VERSION: 1.0 -// !LANGUAGE: -ProperIeee754Comparisons - -fun box(): String { - val nullValue: Any? = null - val nullDouble: Double? = null - val minusZero: Any = -0.0 - if (nullValue is Double?) { - when (nullValue) { - -0.0 -> { - return "fail 1" - } - nullDouble -> {} - else -> return "fail 2" - } - - if (minusZero is Double) { - when (nullValue) { - minusZero -> { - return "fail 3" - } - nullDouble -> { - } - else -> return "fail 4" - } - } - - } - return "OK" -} - -// 4 areEqual \(Ljava/lang/Object;Ljava/lang/Object;\)Z -// 4 areEqual diff --git a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/noInlineJavaProtectedConstants.kt b/compiler/testData/codegen/bytecodeText/oldLanguageVersions/noInlineJavaProtectedConstants.kt deleted file mode 100644 index 87bf497da50..00000000000 --- a/compiler/testData/codegen/bytecodeText/oldLanguageVersions/noInlineJavaProtectedConstants.kt +++ /dev/null @@ -1,24 +0,0 @@ -// !LANGUAGE: -InlineConstVals -// IGNORE_BACKEND: JVM_IR -// FILE: first/Foo.java - -package first; - -public class Foo { - protected static final int FOO = 42; -} - -// FILE: bar.kt - -package second - -import first.Foo - -class Bar : Foo() { - fun bar() = FOO -} - -// @second/BarKt.class -// 1 INVOKESTATIC -// 0 GETSTATIC -// 1 BIPUSH 42 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 c82a52bc9ba..8884fc2aeb7 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 @@ -24927,212 +24927,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - public class OldLanguageVersions { - @Test - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("dataClassEqualsHashCodeToString.kt") - public void testDataClassEqualsHashCodeToString() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures") - @TestDataPath("$PROJECT_ROOT") - public class ControlStructures { - @Test - public void testAllFilesPresentInControlStructures() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray") - @TestDataPath("$PROJECT_ROOT") - public class ForInArray { - @Test - public void testAllFilesPresentInForInArray() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody12.kt") - public void testForInArrayWithArrayVarUpdatedInLoopBody12() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt"); - } - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions") - @TestDataPath("$PROJECT_ROOT") - public class Functions { - @Test - public void testAllFilesPresentInFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity") - @TestDataPath("$PROJECT_ROOT") - public class BigArity { - @Test - public void testAllFilesPresentInBigArity() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("noBigFunctionTypes.kt") - public void testNoBigFunctionTypes() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt"); - } - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - public class Ieee754 { - @Test - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("explicitEqualsCallNull.kt") - public void testExplicitEqualsCallNull() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/explicitEqualsCallNull.kt"); - } - - @Test - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @Test - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @Test - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @Test - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @Test - @TestMetadata("when10.kt") - public void testWhen10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt"); - } - - @Test - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop") - @TestDataPath("$PROJECT_ROOT") - public class JavaInterop { - @Test - public void testAllFilesPresentInJavaInterop() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - public class NotNullAssertions { - @Test - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt") - public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt"); - } - - @Test - @TestMetadata("incWithNullabilityAssertionOnExtensionReceiver_lv11.kt") - public void testIncWithNullabilityAssertionOnExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt"); - } - - @Test - @TestMetadata("nullabilityAssertionOnExtensionReceiver_lv11.kt") - public void testNullabilityAssertionOnExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt"); - } - - @Test - @TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt") - public void testNullabilityAssertionOnInlineFunExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt"); - } - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions") - @TestDataPath("$PROJECT_ROOT") - public class OperatorConventions { - @Test - public void testAllFilesPresentInOperatorConventions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("percentAsModOnBigIntegerWithoutRem.kt") - public void testPercentAsModOnBigIntegerWithoutRem() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes") - @TestDataPath("$PROJECT_ROOT") - public class PlatformTypes { - @Test - public void testAllFilesPresentInPlatformTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives") - @TestDataPath("$PROJECT_ROOT") - public class Primitives { - @Test - public void testAllFilesPresentInPrimitives() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("equalsNull_lv11.kt") - public void testEqualsNull_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives/equalsNull_lv11.kt"); - } - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java index 43e6f54d190..2f284b56585 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java @@ -4507,96 +4507,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/bytecodeText/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - public class OldLanguageVersions { - @Test - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("noInlineJavaProtectedConstants.kt") - public void testNoInlineJavaProtectedConstants() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/noInlineJavaProtectedConstants.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty") - @TestDataPath("$PROJECT_ROOT") - public class ConstProperty { - @Test - @TestMetadata("accessorsForPrivateConstants.kt") - public void testAccessorsForPrivateConstants() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty/accessorsForPrivateConstants.kt"); - } - - @Test - public void testAllFilesPresentInConstProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/oldLanguageVersions/constProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - public class Ieee754 { - @Test - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @Test - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @Test - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @Test - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @Test - @TestMetadata("smartCastsForDouble10.kt") - public void testSmartCastsForDouble10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForDouble10.kt"); - } - - @Test - @TestMetadata("smartCastsForFloat10.kt") - public void testSmartCastsForFloat10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/smartCastsForFloat10.kt"); - } - - @Test - @TestMetadata("when10.kt") - public void testWhen10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/when10.kt"); - } - - @Test - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/bytecodeText/optimizedDelegatedProperties") @TestDataPath("$PROJECT_ROOT") 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 21a799582d4..3d26247b4ba 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 @@ -22,7 +22,7 @@ import java.util.regex.Pattern; public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "oldLanguageVersions"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java index de081a57448..db61e2845a4 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java @@ -40,7 +40,7 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { @Test public void testAllFilesPresentInBytecodeText() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "oldLanguageVersions"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Test diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index 15b26f7860a..5efc4bfc47c 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -65,7 +65,7 @@ fun generateJUnit5CompilerTests(args: Array) { } testClass { - model("codegen/box", excludeDirs = listOf("oldLanguageVersions")) + model("codegen/box") } testClass { @@ -85,7 +85,7 @@ fun generateJUnit5CompilerTests(args: Array) { } testClass { - model("codegen/bytecodeText", excludeDirs = listOf("oldLanguageVersions")) + model("codegen/bytecodeText") } testClass { @@ -124,11 +124,11 @@ fun generateJUnit5CompilerTests(args: Array) { testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") { testClass { - model("codegen/box", excludeDirs = listOf("oldLanguageVersions")) + model("codegen/box") } testClass { - model("codegen/boxInline", excludeDirs = listOf("oldLanguageVersions")) + model("codegen/boxInline") } } @@ -152,7 +152,7 @@ fun generateJUnit5CompilerTests(args: Array) { } testClass { - model("codegen/bytecodeText", excludeDirs = listOf("oldLanguageVersions")) + model("codegen/bytecodeText") } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 6150d21095b..ca8036bff73 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -21178,229 +21178,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OldLanguageVersions extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("dataClassEqualsHashCodeToString.kt") - public void testDataClassEqualsHashCodeToString() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt"); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInControlStructures() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ForInArray extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInForInArray() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody12.kt") - public void testForInArrayWithArrayVarUpdatedInLoopBody12() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BigArity extends AbstractLightAnalysisModeTest { - @TestMetadata("noBigFunctionTypes.kt") - public void ignoreNoBigFunctionTypes() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInBigArity() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Ieee754 extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("explicitEqualsCallNull.kt") - public void testExplicitEqualsCallNull() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/explicitEqualsCallNull.kt"); - } - - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @TestMetadata("when10.kt") - public void testWhen10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt"); - } - - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaInterop extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInJavaInterop() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class NotNullAssertions extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt") - public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt"); - } - - @TestMetadata("incWithNullabilityAssertionOnExtensionReceiver_lv11.kt") - public void testIncWithNullabilityAssertionOnExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt"); - } - - @TestMetadata("nullabilityAssertionOnExtensionReceiver_lv11.kt") - public void testNullabilityAssertionOnExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt"); - } - - @TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt") - public void testNullabilityAssertionOnInlineFunExtensionReceiver_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorConventions extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInOperatorConventions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("percentAsModOnBigIntegerWithoutRem.kt") - public void testPercentAsModOnBigIntegerWithoutRem() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypes extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInPlatformTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Primitives extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInPrimitives() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("equalsNull_lv11.kt") - public void testEqualsNull_lv11() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives/equalsNull_lv11.kt"); - } - } - } - } - @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index 30f955daf95..84438d9a968 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -103,8 +103,6 @@ fun main(args: Array) { // TODO: Support delegated properties "delegatedProperty", - "oldLanguageVersions", - "compileKotlinAgainstKotlin" ) ) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java index f1413024a07..22e16155bb8 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java @@ -17078,189 +17078,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OldLanguageVersions extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("dataClassEqualsHashCodeToString.kt") - public void testDataClassEqualsHashCodeToString() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt"); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInControlStructures() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ForInArray extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInForInArray() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody12.kt") - public void testForInArrayWithArrayVarUpdatedInLoopBody12() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BigArity extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInBigArity() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("noBigFunctionTypes.kt") - public void testNoBigFunctionTypes() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Ieee754 extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaInterop extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInJavaInterop() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class NotNullAssertions extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorConventions extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInOperatorConventions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypes extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInPlatformTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Primitives extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInPrimitives() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - } - } - @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 9ece45229a7..35a5b27b444 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -16563,189 +16563,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OldLanguageVersions extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("dataClassEqualsHashCodeToString.kt") - public void testDataClassEqualsHashCodeToString() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt"); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInControlStructures() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ForInArray extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInForInArray() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody12.kt") - public void testForInArrayWithArrayVarUpdatedInLoopBody12() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BigArity extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInBigArity() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("noBigFunctionTypes.kt") - public void testNoBigFunctionTypes() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Ieee754 extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaInterop extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInJavaInterop() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class NotNullAssertions extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorConventions extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInOperatorConventions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypes extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInPlatformTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Primitives extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInPrimitives() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - } - } - @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 09b27b46438..19c1f9409d1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -16628,194 +16628,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OldLanguageVersions extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInOldLanguageVersions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("dataClassEqualsHashCodeToString.kt") - public void testDataClassEqualsHashCodeToString() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt"); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInControlStructures() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ForInArray extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInForInArray() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody12.kt") - public void testForInArrayWithArrayVarUpdatedInLoopBody12() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BigArity extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInBigArity() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("noBigFunctionTypes.kt") - public void testNoBigFunctionTypes() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt"); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/ieee754") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Ieee754 extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInIeee754() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/ieee754"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("nullableDoubleEquals10.kt") - public void testNullableDoubleEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleEquals10.kt"); - } - - @TestMetadata("nullableDoubleNotEquals10.kt") - public void testNullableDoubleNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableDoubleNotEquals10.kt"); - } - - @TestMetadata("nullableFloatEquals10.kt") - public void testNullableFloatEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatEquals10.kt"); - } - - @TestMetadata("nullableFloatNotEquals10.kt") - public void testNullableFloatNotEquals10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/nullableFloatNotEquals10.kt"); - } - - @TestMetadata("when10.kt") - public void testWhen10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/when10.kt"); - } - - @TestMetadata("whenNullableSmartCast10.kt") - public void testWhenNullableSmartCast10() throws Exception { - runTest("compiler/testData/codegen/box/oldLanguageVersions/ieee754/whenNullableSmartCast10.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaInterop extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInJavaInterop() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class NotNullAssertions extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorConventions extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInOperatorConventions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypes extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInPlatformTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Primitives extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInPrimitives() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - } - } - @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index 72c3b85e92f..e5f94e5ea75 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -27,7 +27,7 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "toArray", "classLiteral", "reflection", "contracts", "platformTypes", "ranges/stepped/unsigned", "coroutines", "parametersMetadata", "finally", "deadCodeElimination", "controlStructures/tryCatchInExpressions", "delegatedProperty", "oldLanguageVersions", "compileKotlinAgainstKotlin"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "toArray", "classLiteral", "reflection", "contracts", "platformTypes", "ranges/stepped/unsigned", "coroutines", "parametersMetadata", "finally", "deadCodeElimination", "controlStructures/tryCatchInExpressions", "delegatedProperty", "compileKotlinAgainstKotlin"); } @TestMetadata("compiler/testData/codegen/box/annotations")