[FIR] Slightly reorganize directory structure of FIR plugin prototype
This commit is contained in:
Dmitriy Novozhilov
committed by
TeamCityServer
TeamCityServer
parent
d585027431
commit
1d32d5c7d8
+1
-1
@@ -8,7 +8,7 @@
|
||||
<option value="$PROJECT_DIR$/compiler/tests-spec/testData" />
|
||||
<option value="$PROJECT_DIR$/js/js.translator/testData" />
|
||||
<option value="$PROJECT_DIR$/plugins/parcelize/parcelize-compiler/testData" />
|
||||
<option value="$PROJECT_DIR$/plugins/fir/fir-plugin-prototype/testData" />
|
||||
<option value="$PROJECT_DIR$/plugins/fir-plugin-prototype/testData" />
|
||||
</array>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
+2
-2
@@ -732,7 +732,7 @@ tasks {
|
||||
dependsOn(":compiler:fir:analysis-tests:test")
|
||||
dependsOn(":compiler:fir:analysis-tests:legacy-fir-tests:test")
|
||||
dependsOn(":compiler:fir:fir2ir:test")
|
||||
dependsOn(":plugins:fir:fir-plugin-prototype:test")
|
||||
dependsOn(":plugins:fir-plugin-prototype:test")
|
||||
}
|
||||
|
||||
register("firAllTest") {
|
||||
@@ -743,7 +743,7 @@ tasks {
|
||||
":compiler:fir:analysis-tests:test",
|
||||
":compiler:fir:analysis-tests:legacy-fir-tests:test",
|
||||
":compiler:fir:fir2ir:test",
|
||||
":plugins:fir:fir-plugin-prototype:test"
|
||||
":plugins:fir-plugin-prototype:test"
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ dependencies {
|
||||
testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
|
||||
testApi(projectTests(":kotlinx-serialization-compiler-plugin"))
|
||||
testApi(projectTests(":kotlinx-atomicfu-compiler-plugin"))
|
||||
testApi(projectTests(":plugins:fir:fir-plugin-prototype"))
|
||||
testApi(projectTests(":plugins:fir-plugin-prototype"))
|
||||
testApi(projectTests(":generators:test-generator"))
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testImplementation(intellijDep()) { includeJars("idea_rt") }
|
||||
|
||||
@@ -382,7 +382,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
}
|
||||
|
||||
testGroup("plugins/fir/fir-plugin-prototype/tests-gen", "plugins/fir/fir-plugin-prototype/testData") {
|
||||
testGroup("plugins/fir-plugin-prototype/tests-gen", "plugins/fir-plugin-prototype/testData") {
|
||||
testClass<AbstractFirPluginDiagnosticTest> {
|
||||
model("diagnostics")
|
||||
}
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
|
||||
useJUnitPlatform()
|
||||
jvmArgs!!.removeIf { it.contains("-Xmx") }
|
||||
maxHeapSize = "3g"
|
||||
dependsOn(":plugins:fir:fir-plugin-prototype:plugin-annotations:jar")
|
||||
dependsOn(":plugins:fir-plugin-prototype:plugin-annotations:jar")
|
||||
}
|
||||
|
||||
testsJar()
|
||||
+7
-7
@@ -17,41 +17,41 @@ import java.util.regex.Pattern;
|
||||
|
||||
/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
|
||||
@SuppressWarnings("all")
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/box")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/box")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class FirPluginBlackBoxCodegenTestGenerated extends AbstractFirPluginBlackBoxCodegenTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classWithCompanionObject.kt")
|
||||
public void testClassWithCompanionObject() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/box/classWithCompanionObject.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/box/classWithCompanionObject.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classWithGeneratedMembersAndNestedClass.kt")
|
||||
public void testClassWithGeneratedMembersAndNestedClass() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("generatedClassWithMembersAndNestedClasses.kt")
|
||||
public void testGeneratedClassWithMembersAndNestedClasses() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("newSupertype.kt")
|
||||
public void testNewSupertype() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/box/newSupertype.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/box/newSupertype.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("topLevelCallables.kt")
|
||||
public void testTopLevelCallables() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/box/topLevelCallables.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/box/topLevelCallables.kt");
|
||||
}
|
||||
}
|
||||
+20
-20
@@ -16,111 +16,111 @@ import java.util.regex.Pattern;
|
||||
|
||||
/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
|
||||
@SuppressWarnings("all")
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class FirPluginDiagnosticTestGenerated extends AbstractFirPluginDiagnosticTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInDiagnostics() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics/checkers")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Checkers {
|
||||
@Test
|
||||
public void testAllFilesPresentInCheckers() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics/checkers"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("signedNumbersCheckers.kt")
|
||||
public void testSignedNumbersCheckers() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("simple.kt")
|
||||
public void testSimple() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics/memberGen")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class MemberGen {
|
||||
@Test
|
||||
public void testAllFilesPresentInMemberGen() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics/memberGen"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classWithCompanionObject.kt")
|
||||
public void testClassWithCompanionObject() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classWithGeneratedMembersAndNestedClass.kt")
|
||||
public void testClassWithGeneratedMembersAndNestedClass() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("generatedClassWithMembersAndNestedClasses.kt")
|
||||
public void testGeneratedClassWithMembersAndNestedClasses() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("topLevelCallables.kt")
|
||||
public void testTopLevelCallables() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/status")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics/status")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Status {
|
||||
@Test
|
||||
public void testAllFilesPresentInStatus() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/status"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics/status"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("metaAnnotation.kt")
|
||||
public void testMetaAnnotation() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("simpleAnnotation.kt")
|
||||
public void testSimpleAnnotation() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("visibilityTransformation.kt")
|
||||
public void testVisibilityTransformation() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes")
|
||||
@TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics/supertypes")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Supertypes {
|
||||
@Test
|
||||
public void testAllFilesPresentInSupertypes() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics/supertypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("simple.kt")
|
||||
public void testSimple() throws Exception {
|
||||
runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt");
|
||||
runTest("plugins/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -16,7 +16,7 @@ import java.io.FilenameFilter
|
||||
|
||||
class PluginAnnotationsProvider(testServices: TestServices) : EnvironmentConfigurator(testServices) {
|
||||
companion object {
|
||||
private const val ANNOTATIONS_JAR_DIR = "plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/"
|
||||
private const val ANNOTATIONS_JAR_DIR = "plugins/fir-plugin-prototype/plugin-annotations/build/libs/"
|
||||
private val ANNOTATIONS_JAR_FILTER = FilenameFilter { _, name -> name.startsWith("plugin-annotations") && name.endsWith(".jar") }
|
||||
}
|
||||
|
||||
@@ -27,5 +27,5 @@ class PluginAnnotationsProvider(testServices: TestServices) : EnvironmentConfigu
|
||||
configuration.addJvmClasspathRoot(jar)
|
||||
}
|
||||
|
||||
private val failMessage = { "Jar with annotations does not exist. Please run :plugins:fir:fir-plugin-prototype:plugin-annotations:jar" }
|
||||
private val failMessage = { "Jar with annotations does not exist. Please run :plugins:fir-plugin-prototype:plugin-annotations:jar" }
|
||||
}
|
||||
+2
-2
@@ -195,8 +195,8 @@ include ":benchmarks",
|
||||
":kotlin-sam-with-receiver-compiler-plugin",
|
||||
":kotlin-imports-dumper-compiler-plugin",
|
||||
":kotlin-script-runtime",
|
||||
":plugins:fir:fir-plugin-prototype",
|
||||
":plugins:fir:fir-plugin-prototype:plugin-annotations",
|
||||
":plugins:fir-plugin-prototype",
|
||||
":plugins:fir-plugin-prototype:plugin-annotations",
|
||||
":kotlin-test:kotlin-test-common",
|
||||
":kotlin-test:kotlin-test-annotations-common",
|
||||
":kotlin-test:kotlin-test-jvm",
|
||||
|
||||
Reference in New Issue
Block a user