From f3d5a71c34adde6960be16ecd522222b050fbe3d Mon Sep 17 00:00:00 2001 From: Andrei Klunnyi Date: Thu, 25 Mar 2021 14:22:04 +0100 Subject: [PATCH] [CHERRY PICKED FROM IJ] Test marathon: MultiplatformJpsTestWithGeneratedContentGenerated (Js) The following tests are outdated (JPS/Js is no longer supported): - MultiplatformJpsTestWithGeneratedContentGenerated$Simple.testEditingPJsKotlin - MultiplatformJpsTestWithGeneratedContentGenerated$SimpleNewMpp.testEditingPJsKotlin GitOrigin-RevId: e4c4b5a75b39803bc5df966a3d957e5ab0f253b1 Original commit: https://github.com/JetBrains/intellij-community/commit/49542e2cce00b08f87c0c91093dff4e8c9df1032 --- ...mJpsTestWithGeneratedContentGenerated.java | 10 ---- .../simple/editingPJsKotlin/build.log | 53 ------------------- .../simpleNewMpp/editingPJsKotlin/build.log | 47 ---------------- 3 files changed, 110 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/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 af3d693900c..74d100e9b87 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 @@ -41,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("editingPJsKotlin") - public void testEditingPJsKotlin() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/"); - } - @TestMetadata("editingPJvmJava") public void testEditingPJvmJava() throws Exception { runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/"); @@ -170,11 +165,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("editingPJsKotlin") - public void testEditingPJsKotlin() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/"); - } - @TestMetadata("editingPJvmJava") public void testEditingPJvmJava() throws Exception { runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log deleted file mode 100644 index 65de85f043d..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log +++ /dev/null @@ -1,53 +0,0 @@ -================ Step #1 create new service ================= - -Building c -Exit code: NOTHING_DONE ------------------------------------------- -Building pJs -Compiling files: - pJs/src/servicePJsNewImpl.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- - -================ 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: - pJs/src/servicePJsNewImpl.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- - -================ 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 ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log deleted file mode 100644 index 6eac48fd950..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log +++ /dev/null @@ -1,47 +0,0 @@ -================ Step #1 create new service ================= - -Building c -Building pJs -Compiling files: - pJs/src/servicePJsNewImpl.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- - -================ 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: - pJs/src/servicePJsNewImpl.kt -End of files -Exit code: OK ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- - -================ 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 ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- \ No newline at end of file