From 4e260345a4f35e5e85f6a343181a9c3a9ae455f5 Mon Sep 17 00:00:00 2001 From: Andrei Klunnyi Date: Wed, 24 Mar 2021 12:07:08 +0100 Subject: [PATCH] [CHERRY PICKED FROM IJ] Test marathon: MultiplatformJpsTestWithGeneratedContentGenerated (Native) The following tests are outdated (JPS/Native is no longer supported): - MultiplatformJpsTestWithGeneratedContentGenerated$IgnoreAndWarnAboutNative.testEditingCKotlin - MultiplatformJpsTestWithGeneratedContentGenerated$Simple.testEditingCKotlin - MultiplatformJpsTestWithGeneratedContentGenerated$SimpleNewMpp.testEditingCKotlin GitOrigin-RevId: 6e81a4a86a480563992b6fbde4ecbf47571bb49e Original commit: https://github.com/JetBrains/intellij-community/commit/2a3a84bfa69853efd0be2eaca183cd615af03080 --- ...mJpsTestWithGeneratedContentGenerated.java | 41 --------- .../ignoreAndWarnAboutNative/dependencies.txt | 13 --- .../editingCKotlin/build.log | 84 ------------------- .../simple/editingCKotlin/build.log | 69 --------------- .../simpleNewMpp/editingCKotlin/build.log | 63 -------------- 5 files changed, 270 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java index 747ea41ecaf..af3d693900c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java @@ -29,37 +29,6 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent"), Pattern.compile("^([^\\.]+)$"), null, true); } - @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class IgnoreAndWarnAboutNative extends AbstractMultiplatformJpsTestWithGeneratedContent { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInIgnoreAndWarnAboutNative() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative"), Pattern.compile("^([^\\.]+)$"), null, true); - } - - @TestMetadata("editingCKotlin") - public void testEditingCKotlin() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/"); - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class EditingCKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInEditingCKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); - } - } - } - @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -72,11 +41,6 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple"), Pattern.compile("^([^\\.]+)$"), null, true); } - @TestMetadata("editingCKotlin") - public void testEditingCKotlin() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/"); - } - @TestMetadata("editingPJsKotlin") public void testEditingPJsKotlin() throws Exception { runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/"); @@ -206,11 +170,6 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp"), Pattern.compile("^([^\\.]+)$"), null, true); } - @TestMetadata("editingCKotlin") - public void testEditingCKotlin() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/"); - } - @TestMetadata("editingPJsKotlin") public void testEditingPJsKotlin() throws Exception { runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt deleted file mode 100644 index 38246e16ead..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt +++ /dev/null @@ -1,13 +0,0 @@ -c [sourceSetHolder, edit] - -pJvm [compilationAndSourceSetHolder, jvm] -pJvm -> c [include] - -pJs [compilationAndSourceSetHolder, js] -pJs -> c [include] - -pNative1 [compilationAndSourceSetHolder, native] -pNative1 -> c [include] - -pNative2 [compilationAndSourceSetHolder, native] -pNative2 -> c [include] \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log deleted file mode 100644 index e1c4dca2175..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log +++ /dev/null @@ -1,84 +0,0 @@ -================ Step #1 create new service ================= - -Building c -Building pNative2 -Native is not yet supported in IDEA internal build system. Please use Gradle to build pNative1 and pNative2 (enable 'Delegate IDE build/run actions to Gradle' in Settings). -Exit code: NOTHING_DONE ------------------------------------------- -Building pNative1 -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 edit new service ================= - -Building c -Building pNative2 -Native is not yet supported in IDEA internal build system. Please use Gradle to build pNative1 and pNative2 (enable 'Delegate IDE build/run actions to Gradle' in Settings). -Exit code: NOTHING_DONE ------------------------------------------- -Building pNative1 -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #3 delete new service ================= - -Building c -Building pNative2 -Native is not yet supported in IDEA internal build system. Please use Gradle to build pNative1 and pNative2 (enable 'Delegate IDE build/run actions to Gradle' in Settings). -Exit code: NOTHING_DONE ------------------------------------------- -Building pNative1 -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Building pJvm -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log deleted file mode 100644 index bfeb6cc4653..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log +++ /dev/null @@ -1,69 +0,0 @@ -================ Step #1 create new service ================= - -Building c -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 edit new service ================= - -Building c -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #3 delete new service ================= - -Building c -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Building pJvm -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log deleted file mode 100644 index 5da9fbeb77d..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log +++ /dev/null @@ -1,63 +0,0 @@ -================ Step #1 create new service ================= - -Building c -Building pJs -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 edit new service ================= - -Building c -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Compiling files: - c/src/serviceCNewHeader.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #3 delete new service ================= - -Building c -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/pJvm/META-INF/pJvm.kotlin_module - out/production/pJvm/ServiceCNewHeaderKt.class -End of files -Building pJvm -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file