From d2980883b781682a04fd7d1cb8afa3e8269986da Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Wed, 27 Oct 2021 16:08:31 +0300
Subject: [PATCH] [kotlin:testdata] Update testdata for
 IncrementalJvmJpsTestGenerated

Included changes:
379eb3f350539c Fix test IncrementalJvmJpsTestGenerated$WithJava$Other.testMultifileClassFileAdded
63b7a47898ca42 [testdata] Fix Jps tests testdata
767e58ba3d3e40 [testdata] Replace test IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance with new one

GitOrigin-RevId: 3316a2cf134dce248b47acccd33edd291c4ec3d4
---
 .../javaUsedInKotlin/mixedInheritance/BaseClass.java   |  3 +++
 .../mixedInheritance/BaseClass.java.new.1              |  4 ++++
 .../mixedInheritance/BaseClass.java.new.2              |  3 +++
 .../mixedInheritance/BaseClass.java.new.3              |  6 ++++++
 .../mixedInheritance/BaseClass.java.new.4              |  7 +++++++
 .../mixedInheritance/BaseClass.java.new.5              |  6 ++++++
 .../mixedInheritance/BaseClass.java.new.7              |  6 ++++++
 .../javaUsedInKotlin/mixedInheritance/DerivedClass1.kt |  3 +++
 .../mixedInheritance/DerivedClass1.kt.new.6            |  6 ++++++
 .../javaUsedInKotlin/mixedInheritance/fir-build.log    | 10 ----------
 .../samConversions/methodAddDefault/build.log          |  1 -
 11 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt
 create mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6
 delete mode 100644 plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log

diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java
new file mode 100644
index 000000000000..8e202758dadf
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java
@@ -0,0 +1,3 @@
+abstract public class BaseClass {
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1
new file mode 100644
index 000000000000..3de389d9caaa
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1
@@ -0,0 +1,4 @@
+// add abstract method, when derived class is not abstract
+abstract public class BaseClass {
+    abstract void myAbs();
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2
new file mode 100644
index 000000000000..03c9cfedb007
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2
@@ -0,0 +1,3 @@
+// fix
+public class BaseClass {
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3
new file mode 100644
index 000000000000..581d6f3becbf
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3
@@ -0,0 +1,6 @@
+// add method to Base, that does not clash with derived
+public class BaseClass {
+    void doSmthAnother() {
+        System.out.println(":)");
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4
new file mode 100644
index 000000000000..196cdcc35158
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4
@@ -0,0 +1,7 @@
+// add method to Base, that CLASH with derived
+public class BaseClass {
+    void doSmthAnother() {
+        System.out.println(":)");
+    }
+    void doSmth() {}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5
new file mode 100644
index 000000000000..91d23bb37ea6
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5
@@ -0,0 +1,6 @@
+// fix clash
+public class BaseClass {
+    void doSmthAnother() {
+        System.out.println(":)");
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7
new file mode 100644
index 000000000000..0eba476783a5
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7
@@ -0,0 +1,6 @@
+// change return type
+public class BaseClass {
+    String doSmthAnother() {
+        return ":)";
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt
new file mode 100644
index 000000000000..12f7d7fd0101
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt
@@ -0,0 +1,3 @@
+open class DerivedClass1 : BaseClass() {
+    fun doSmth() {}
+}
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6 b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6
new file mode 100644
index 000000000000..c7d7e9498043
--- /dev/null
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6
@@ -0,0 +1,6 @@
+open class DerivedClass1 : BaseClass() {
+    fun doSmth() {}
+    override fun doSmthAnother() {
+        println(":))")
+    }
+}
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log
deleted file mode 100644
index daa5feaf17e1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/BaseClass.kt
-  src/usage1.kt
-  src/usage2.kt
-  src/usage3.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
index 79032a5fcaed..589017c97e08 100644
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
@@ -10,7 +10,6 @@ Compiling files:
 End of files
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$0.class
   out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
   out/production/module/UsageWithFunctionExpressionKt.class
   out/production/module/UsageWithFunctionLiteralKt.class