From 460a77275a5e5ec5745e5999d5b9a5698a9b73a7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Feb 2015 20:13:03 +0300 Subject: [PATCH] Added tests with conversion between Java and Kotlin and moving class. --- .../build/IncrementalJpsTestGenerated.java | 18 ++++++++++ .../incremental/pureKotlin/moveClass/a.kt | 1 + .../pureKotlin/moveClass/a.kt.delete.1 | 0 .../pureKotlin/moveClass/b.kt.delete.2 | 0 .../pureKotlin/moveClass/b.kt.new.1 | 1 + .../pureKotlin/moveClass/build.log | 13 ++++++++ .../javaToKotlinAndBack/Foo.java | 4 +++ .../javaToKotlinAndBack/Foo.java.delete.1 | 0 .../javaToKotlinAndBack/Foo.java.new.2 | 4 +++ .../javaToKotlinAndBack/Foo.kt.delete.2 | 0 .../javaToKotlinAndBack/Foo.kt.new.1 | 5 +++ .../javaToKotlinAndBack/build.log | 33 +++++++++++++++++++ .../javaToKotlinAndBack/usage.kt | 3 ++ .../javaToKotlinAndBack/usage.kt.new.1 | 3 ++ .../javaToKotlinAndBack/usage.kt.new.2 | 3 ++ .../javaToKotlinAndRemove/TheClass.java | 2 ++ .../TheClass.java.delete.1 | 0 .../TheClass.kt.delete.2 | 0 .../javaToKotlinAndRemove/TheClass.kt.new.1 | 1 + .../javaToKotlinAndRemove/build.log | 13 ++++++++ 20 files changed, 104 insertions(+) create mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 create mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 create mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 create mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/build.log create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 create mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index a8e6b201fb0..d21508ddb34 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -285,6 +285,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("moveClass") + public void testMoveClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); + doTest(fileName); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); @@ -449,6 +455,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("javaToKotlinAndBack") + public void testJavaToKotlinAndBack() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); + doTest(fileName); + } + + @TestMetadata("javaToKotlinAndRemove") + public void testJavaToKotlinAndRemove() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); + doTest(fileName); + } + @TestMetadata("kotlinToJava") public void testKotlinToJava() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt b/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 b/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 b/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log new file mode 100644 index 00000000000..9918454d06c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/Foo.class +End of files +Compiling files: +src/b.kt +End of files + + +Cleaning output files: +out/production/module/Foo.class +End of files +Compiling files: +End of files diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java new file mode 100644 index 00000000000..4a55c67d4ac --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java @@ -0,0 +1,4 @@ +class Foo { + void bar() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 new file mode 100644 index 00000000000..4a55c67d4ac --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 @@ -0,0 +1,4 @@ +class Foo { + void bar() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 new file mode 100644 index 00000000000..fd3049a57c6 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 @@ -0,0 +1,5 @@ +class Foo { + fun baz() { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log new file mode 100644 index 00000000000..392e88adfbd --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -0,0 +1,33 @@ +Cleaning output files: +out/production/module/Foo.class +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/Foo.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files + + +Cleaning output files: +out/production/module/Foo.class +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/Foo.java +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt new file mode 100644 index 00000000000..71ee477874c --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + Foo().bar() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 new file mode 100644 index 00000000000..ad3a299f597 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 @@ -0,0 +1,3 @@ +fun main(args: Array) { + Foo().baz() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 new file mode 100644 index 00000000000..f66de4d04e0 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 @@ -0,0 +1,3 @@ +fun main(args: Array) { +// Foo().bar() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java new file mode 100644 index 00000000000..e53046270c9 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java @@ -0,0 +1,2 @@ +public class TheClass { +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 new file mode 100644 index 00000000000..d02d5373a87 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 @@ -0,0 +1 @@ +public class TheClass \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log new file mode 100644 index 00000000000..15a35947ed4 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +src/TheClass.kt +End of files + + +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +End of files