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

[FIR] Rename nested directory with testdata to innerClasses

Browse Source 
This is needed to avoid clashing name of generated test class (`Nested`)
  with annotation @Nested from JUnit 5
This commit is contained in:
Dmitriy Novozhilov
2020-11-12 16:23:04 +03:00
parent 419f54259c
commit e3bfb9245c
11 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/nested/inner.kt → compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/inner.txt → compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.txt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/innerTypeFromSuperClassInBody.kt → compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/innerTypeFromSuperClassInBody.txt → compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt → compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt → compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/simple.kt → compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt
Vendored
View File
compiler/fir/analysis-tests/testData/resolve/nested/simple.txt → compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.txt
Vendored
View File
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
Generated
+33 -33
View File
@@ -1820,6 +1820,39 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InnerClasses extends AbstractFirDiagnosticsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInInnerClasses() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -1916,39 +1949,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractFirDiagnosticsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInNested() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
Generated
+33 -33
View File
@@ -1820,6 +1820,39 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InnerClasses extends AbstractFirDiagnosticsWithLightTreeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInInnerClasses() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -1916,39 +1949,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractFirDiagnosticsWithLightTreeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInNested() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
Generated
+33 -33
View File
@@ -1820,6 +1820,39 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InnerClasses extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInInnerClasses() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -1916,39 +1949,6 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInNested() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@TestMetadata("inner.kt")
public void testInner() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
}
@TestMetadata("innerTypeFromSuperClassInBody.kt")
public void testInnerTypeFromSuperClassInBody() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypeFromSuperClassInBody.kt");
}
@TestMetadata("innerTypes.kt")
public void testInnerTypes() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
}
}
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)