From 76b9167c15ab2907aa2d86fe988be2e9177dc27f Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 17 Dec 2021 06:38:52 +0300 Subject: [PATCH] [JS IC TEST] Add test case about moving file between modules --- .../incremental/InvalidationTestGenerated.java | 5 +++++ .../moveFilesBetweenModules/lib1/l11.kt | 2 ++ .../moveFilesBetweenModules/lib1/l12.kt | 2 ++ .../moveFilesBetweenModules/lib1/l12_n.kt.2 | 2 ++ .../moveFilesBetweenModules/lib1/module.info | 15 +++++++++++++++ .../moveFilesBetweenModules/lib2/l21.kt | 2 ++ .../moveFilesBetweenModules/lib2/l22.kt.1 | 2 ++ .../moveFilesBetweenModules/lib2/module.info | 15 +++++++++++++++ .../moveFilesBetweenModules/lib3/l3.kt | 2 ++ .../moveFilesBetweenModules/lib3/module.info | 11 +++++++++++ .../moveFilesBetweenModules/main/m.kt | 2 ++ .../moveFilesBetweenModules/main/module.info | 11 +++++++++++ .../moveFilesBetweenModules/project.info | 10 ++++++++++ 13 files changed, 81 insertions(+) create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l11.kt create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12.kt create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12_n.kt.2 create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/module.info create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l21.kt create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l22.kt.1 create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/module.info create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/l3.kt create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/module.info create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/m.kt create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/module.info create mode 100644 js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/project.info diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/InvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/InvalidationTestGenerated.java index 29ff606972b..ecc5402fa05 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/InvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/InvalidationTestGenerated.java @@ -40,6 +40,11 @@ public class InvalidationTestGenerated extends AbstractInvalidationTest { runTest("js/js.translator/testData/incremental/invalidation/fastPath2/"); } + @TestMetadata("moveFilesBetweenModules") + public void testMoveFilesBetweenModules() throws Exception { + runTest("js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/"); + } + @TestMetadata("moveInlineFunctionBetweenModules") public void testMoveInlineFunctionBetweenModules() throws Exception { runTest("js/js.translator/testData/incremental/invalidation/moveInlineFunctionBetweenModules/"); diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l11.kt b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l11.kt new file mode 100644 index 00000000000..2947ecd8ceb --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l11.kt @@ -0,0 +1,2 @@ + +inline fun foo(a: Int) = a * 2 diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12.kt b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12.kt new file mode 100644 index 00000000000..cbd3599212b --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12.kt @@ -0,0 +1,2 @@ + +inline fun bar(b: Int) = b - 3 \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12_n.kt.2 b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12_n.kt.2 new file mode 100644 index 00000000000..dd0d39079dc --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/l12_n.kt.2 @@ -0,0 +1,2 @@ + +inline fun bar(b: Int) = b - 5 \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/module.info b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/module.info new file mode 100644 index 00000000000..94f8915d2fe --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib1/module.info @@ -0,0 +1,15 @@ +STEP 0: + dependencies: stdlib + dirty: l11.kt, l12.kt +STEP 1: + dependencies: stdlib + modifications: + D : l12.kt + dirty: + +STEP 2: + dependencies: stdlib + modifications: + U : l12_n.kt.2 -> l12_n.kt + dirty: l12_n.kt + diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l21.kt b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l21.kt new file mode 100644 index 00000000000..77d5cd44425 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l21.kt @@ -0,0 +1,2 @@ + +inline fun qux(x: Int, y: Int) = foo(x) + bar(y) \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l22.kt.1 b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l22.kt.1 new file mode 100644 index 00000000000..35768eb7ae2 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/l22.kt.1 @@ -0,0 +1,2 @@ + +inline fun bar(b: Int) = b - 4 \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/module.info b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/module.info new file mode 100644 index 00000000000..478999a0666 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib2/module.info @@ -0,0 +1,15 @@ +STEP 0: + dependencies: stdlib, lib1 + dirty: l21.kt + +STEP 1: + dependencies: stdlib, lib1 + modifications: + U : l22.kt.1 -> l22.kt + dirty: l21.kt, l22.kt + +STEP 2: + dependencies: stdlib, lib1 + modifications: + D : l22.kt + dirty: l21.kt \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/l3.kt b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/l3.kt new file mode 100644 index 00000000000..adaa018e630 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/l3.kt @@ -0,0 +1,2 @@ + +inline fun dex(x: Int, y: Int) = qux(x * y, y - x) \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/module.info b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/module.info new file mode 100644 index 00000000000..95a6e01fe56 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/lib3/module.info @@ -0,0 +1,11 @@ +STEP 0: + dependencies: stdlib, lib1, lib2 + dirty: l3.kt + +STEP 1: + dependencies: stdlib, lib1, lib2 + dirty: l3.kt + +STEP 2: + dependencies: stdlib, lib1, lib2 + dirty: l3.kt \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/m.kt b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/m.kt new file mode 100644 index 00000000000..9e4affdeab7 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/m.kt @@ -0,0 +1,2 @@ + +fun box() = dex(4, 2) \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/module.info b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/module.info new file mode 100644 index 00000000000..22de8fc144c --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/main/module.info @@ -0,0 +1,11 @@ +STEP 0: + dependencies: stdlib, lib1, lib2, lib3 + dirty: m.kt + +STEP 1: + dependencies: stdlib, lib1, lib2, lib3 + dirty: m.kt + +STEP 2: + dependencies: stdlib, lib1, lib2, lib3 + dirty: m.kt \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/project.info b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/project.info new file mode 100644 index 00000000000..74641ec7008 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/project.info @@ -0,0 +1,10 @@ +MODULES: lib1, lib2, lib3, main + +STEP 0: + libs: lib1, lib2, lib3, main + +STEP 1: + libs: lib1, lib2, lib3, main + +STEP 2: + libs: lib1, lib2, lib3, main \ No newline at end of file