From 006e1f65280e06fa159ad906dc2ccabcf9a7df44 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 20 Mar 2020 15:20:55 +0300 Subject: [PATCH] [FIR-TEST] Add test for KT-37638 --- .../problems/multipleJavaClassesInOneFile.kt | 14 ++++++++++++++ .../problems/multipleJavaClassesInOneFile.txt | 5 +++++ .../kotlin/fir/FirDiagnosticsTestGenerated.java | 5 +++++ .../FirDiagnosticsWithLightTreeTestGenerated.java | 5 +++++ 4 files changed, 29 insertions(+) create mode 100644 compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt create mode 100644 compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt b/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt new file mode 100644 index 00000000000..a16bfa160e3 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt @@ -0,0 +1,14 @@ +// FILE: Some.java + +package foo; + +class Some {} + +class Another {} + +// FILE: main.kt + +fun test() { + val some = Some() + val another = Another() +} \ No newline at end of file diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt b/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt new file mode 100644 index 00000000000..b58e7b2cd16 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt @@ -0,0 +1,5 @@ +FILE: main.kt + public final fun test(): R|kotlin/Unit| { + lval some: R|Some| = R|/Some.Some|() + lval another: = #() + } diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java index 1116d9a2cea..8b9fcdcb513 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java @@ -1484,6 +1484,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest { public void testJavaArrayInGeneric() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolve/problems/javaArrayInGeneric.kt"); } + + @TestMetadata("multipleJavaClassesInOneFile.kt") + public void testMultipleJavaClassesInOneFile() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt"); + } } @TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties") diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java index 4483870f402..4e87d429e12 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java @@ -1484,6 +1484,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos public void testJavaArrayInGeneric() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolve/problems/javaArrayInGeneric.kt"); } + + @TestMetadata("multipleJavaClassesInOneFile.kt") + public void testMultipleJavaClassesInOneFile() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt"); + } } @TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")