From dd44a567d61890507f7cbe59781e886e825b9ed2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Jul 2017 07:07:01 +0300 Subject: [PATCH] Add IC compiler tests with Java Original commit: 7810da701850a459d3f4315127e4d4f9e7f8088b --- .../javaToKotlinAndRemove/gradle-build.log | 14 +++++++++ .../constantUnchanged/gradle-build.log | 7 +++++ .../enumEntryAdded/gradle-build.log | 29 +++++-------------- .../enumEntryRemoved/gradle-build.log | 22 ++++++++++++++ .../gradle-build.log | 7 +++++ .../notChangeSignature/gradle-build.log | 6 ++++ 6 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/gradle-build.log diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log new file mode 100644 index 00000000000..b43d089d40e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log @@ -0,0 +1,14 @@ +================ Step #1 ================= +Compiling files: + src/TheClass.kt + src/other.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/gradle-build.log new file mode 100644 index 00000000000..6d26dbae105 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/gradle-build.log @@ -0,0 +1,7 @@ +================ Step #1 ================= + +Compiling files: + src/JavaClass.java + src/usage.kt +End of files +Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log index 6d78e93fdff..739c085f5d9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log @@ -1,35 +1,22 @@ ================ Step #1 ================= -Cleaning output files: - out/production/module/Enum.class -End of files -Exit code: NOTHING_DONE ------------------------------------------- Compiling files: src/Enum.java -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/UseKt.class -End of files -Compiling files: + src/getRandomEnumEntry.kt src/use.kt + src/useEnumImplicitly.kt End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -When expression must be exhaustive, add necessary 'C' branch or 'else' branch instead +'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead ================ Step #2 ================= -Cleaning output files: - out/production/module/Enum.class -End of files -Compiling files: - src/use.kt -End of files -Exit code: OK ------------------------------------------- Compiling files: src/Enum.java -End of files \ No newline at end of file + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log new file mode 100644 index 00000000000..b0607ab07a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Compiling files: + src/Enum.java + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: C + +================ Step #2 ================= + +Compiling files: + src/Enum.java + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log new file mode 100644 index 00000000000..5ada4a700d5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log @@ -0,0 +1,7 @@ +================ Step #1 ================= +Compiling files: + src/useA.kt + src/AChild.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/gradle-build.log new file mode 100644 index 00000000000..5b9396ca2b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/gradle-build.log @@ -0,0 +1,6 @@ +================ Step #1 ================= + +Compiling files: + src/JavaClass.java + src/usage.kt +End of files