From 3c33ee9c68f982e106f8d4c1a01fb64bdcda72cc Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 10 Apr 2020 14:43:53 +0300 Subject: [PATCH] [FIR-TEST] Move existing contract tests to `fromLibrary` directory --- .../{ => fromLibrary}/callsInPlace.dot | 0 .../{ => fromLibrary}/callsInPlace.kt | 0 .../{ => fromLibrary}/callsInPlace.txt | 0 .../{ => fromLibrary}/conditionalEffects.dot | 0 .../{ => fromLibrary}/conditionalEffects.kt | 0 .../{ => fromLibrary}/conditionalEffects.txt | 0 .../{ => fromLibrary}/notIsNullOrEmpty.kt | 0 .../{ => fromLibrary}/notIsNullOrEmpty.txt | 0 ...FirDiagnosticsWithStdlibTestGenerated.java | 35 +++++++++++++------ 9 files changed, 24 insertions(+), 11 deletions(-) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/callsInPlace.dot (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/callsInPlace.kt (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/callsInPlace.txt (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/conditionalEffects.dot (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/conditionalEffects.kt (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/conditionalEffects.txt (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/notIsNullOrEmpty.kt (100%) rename compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/{ => fromLibrary}/notIsNullOrEmpty.txt (100%) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.dot rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.kt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.kt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.dot similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.dot rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.dot diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.kt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.kt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/notIsNullOrEmpty.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.kt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/notIsNullOrEmpty.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.kt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/notIsNullOrEmpty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/notIsNullOrEmpty.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java index d7edc7cb90c05..c8c8fcfa9aecb 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java @@ -486,19 +486,32 @@ public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @TestMetadata("callsInPlace.kt") - public void testCallsInPlace() throws Exception { - runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/callsInPlace.kt"); - } + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class FromLibrary extends AbstractFirDiagnosticsWithStdlibTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } - @TestMetadata("conditionalEffects.kt") - public void testConditionalEffects() throws Exception { - runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/conditionalEffects.kt"); - } + public void testAllFilesPresentInFromLibrary() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @TestMetadata("callsInPlace.kt") + public void testCallsInPlace() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.kt"); + } - @TestMetadata("notIsNullOrEmpty.kt") - public void testNotIsNullOrEmpty() throws Exception { - runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/notIsNullOrEmpty.kt"); + @TestMetadata("conditionalEffects.kt") + public void testConditionalEffects() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.kt"); + } + + @TestMetadata("notIsNullOrEmpty.kt") + public void testNotIsNullOrEmpty() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.kt"); + } } }