azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: move diagnostic test to testsWithJvmBackend

Browse Source 
There's a difference in behavior of K1 and K2 here, see KT-66528.

 #KT-66528
This commit is contained in:
Alexander Udalov
2024-03-12 15:09:34 +01:00
committed by Space Team
parent 81a9f5654e
commit c997e9f142
22 changed files with 166 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
-6
View File
@@ -21960,12 +21960,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkRawTypeWithKotlinUpperBound.kt")
public void testKjkRawTypeWithKotlinUpperBound() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -33552,6 +33552,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
-6
View File
@@ -21960,12 +21960,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkRawTypeWithKotlinUpperBound.kt")
public void testKjkRawTypeWithKotlinUpperBound() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -33552,6 +33552,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -21954,12 +21954,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkRawTypeWithKotlinUpperBound.kt")
public void testKjkRawTypeWithKotlinUpperBound() {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -21960,12 +21960,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkRawTypeWithKotlinUpperBound.kt")
public void testKjkRawTypeWithKotlinUpperBound() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+6
View File
@@ -544,6 +544,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("supertypeDifferentParameterNullability.kt")
public void testSupertypeDifferentParameterNullability() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+6
View File
@@ -544,6 +544,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("supertypeDifferentParameterNullability.kt")
public void testSupertypeDifferentParameterNullability() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt
Vendored
+79
View File
@@ -0,0 +1,79 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_K1: JVM, JVM_IR
// FILE: J.java
public class J extends D {}
// FILE: JOverridesRegular.java
public class JOverridesRegular extends D {
@Override
public int getA() {
return 1;
}
}
// FILE: JOverridesExtension.java
public class JOverridesExtension extends D {
@Override
public int getA(String $this) {
return 1;
}
}
// FILE: JOVerridesBoth.java
public class JOVerridesBoth extends D {
@Override
public int getA() {
return 1;
}
@Override
public int getA(String $this) {
return 1;
}
}
// FILE: 1.kt
open class D {
open val a: Int
get() = 2
open val String.a: Int
get() = 1
}
class F : J() {
fun test() {
a
"".a
}
}
class F2 : JOverridesRegular() {
fun test() {
a
"".a
}
}
class F3 : JOverridesExtension() {
fun test() {
a
"".a
}
}
class F4 : JOVerridesBoth() {
fun test() {
a
"".a
}
}
fun box(): String {
F().test()
F2().test()
F3().test()
F4().test()
return "OK"
}
compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.fir.kt → compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.fir.kt
Vendored
View File
compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt → compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt
Vendored
+4 -4
View File
@@ -55,16 +55,16 @@ class F2 : JOverridesRegular() {
}
}
class <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>F3<!> : JOverridesExtension() {
<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>class F3 : JOverridesExtension() {
fun test() {
a
"".a
}
}
}<!>
class <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>F4<!> : JOVerridesBoth() {
<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>class F4 : JOVerridesBoth() {
fun test() {
a
"".a
}
}
}<!>
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
-6
View File
@@ -21960,12 +21960,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkRawTypeWithKotlinUpperBound.kt")
public void testKjkRawTypeWithKotlinUpperBound() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+6
View File
@@ -545,6 +545,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("supertypeDifferentParameterNullability.kt")
public void testSupertypeDifferentParameterNullability() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -31543,6 +31543,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/javaInterop/javaOuterClassDependsOnInner.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kt43217.kt")
public void testKt43217() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java
Generated
+6
View File
@@ -33421,6 +33421,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt");
}
@Test
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void testKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
@Test
@TestMetadata("kjkWithRawTypes.kt")
public void testKjkWithRawTypes() {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -28241,6 +28241,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/javaInterop/invisibleFake2.kt");
}
@TestMetadata("kjkPropertyAndExtensionProperty.kt")
public void ignoreKjkPropertyAndExtensionProperty() {
runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt");
}
private void runTest(String testDataFilePath) {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}