From 40efae00509e54ac9888847a586a35fcd5468f80 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 6 Dec 2012 18:50:10 +0400
Subject: [PATCH] Add JpsTests for inheritance (J-K-J, K-J-K)

Original commit: 1824879dd035942933105bfb55c500eac9db330a
---
 .../jet/jps/build/KotlinJpsBuildTestCase.java     | 15 ++++++++++++++-
 .../JKJInheritanceProject/kotlinProject.iml       | 13 +++++++++++++
 .../JKJInheritanceProject/kotlinProject.ipr       | 14 ++++++++++++++
 .../JKJInheritanceProject/src/java/JFirst.java    |  7 +++++++
 .../JKJInheritanceProject/src/java/JSecond.java   |  7 +++++++
 .../JKJInheritanceProject/src/kotlin/KFirst.kt    |  5 +++++
 .../KJKInheritanceProject/kotlinProject.iml       | 13 +++++++++++++
 .../KJKInheritanceProject/kotlinProject.ipr       | 14 ++++++++++++++
 .../KJKInheritanceProject/src/java/JFirst.java    |  4 ++++
 .../KJKInheritanceProject/src/kotlin/KFirst.kt    |  6 ++++++
 .../KJKInheritanceProject/src/kotlin/KSecond.kt   |  7 +++++++
 11 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml
 create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr
 create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java
 create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java
 create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt
 create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml
 create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr
 create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java
 create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt
 create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt

diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
index 7def715e90a..ec7ee3c206d 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
@@ -20,7 +20,6 @@ import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.jps.model.java.*;
 
 import java.io.File;
-import java.io.IOException;
 
 public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
     private static final String PROJECT_NAME = "kotlinProject";
@@ -49,6 +48,12 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
         makeAll().assertSuccessful();
     }
 
+    public void doTestWithRuntime() {
+        initProject();
+        addKotlinRuntimeDependency();
+        makeAll().assertSuccessful();
+    }
+
     public void testKotlinProject() {
         doTest();
     }
@@ -69,6 +74,14 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
         doTest();
     }
 
+    public void testJKJInheritanceProject() {
+        doTestWithRuntime();
+    }
+
+    public void testKJKInheritanceProject() {
+        doTestWithRuntime();
+    }
+
     public void testTestDependencyLibrary() throws Throwable {
         initProject();
         addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST);
diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml
new file mode 100644
index 00000000000..10db71f5cd2
--- /dev/null
+++ b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+    <orderEntry type="library" name="KotlinRuntime" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr
new file mode 100644
index 00000000000..90747786771
--- /dev/null
+++ b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java
new file mode 100644
index 00000000000..681465bd981
--- /dev/null
+++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java
@@ -0,0 +1,7 @@
+package java;
+
+public class JFirst {
+    public void foo() {
+
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java
new file mode 100644
index 00000000000..67a1468df22
--- /dev/null
+++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java
@@ -0,0 +1,7 @@
+package java;
+
+public class JSecond extends kotlin.KFirst {
+    public void bar() {
+        foo();
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt
new file mode 100644
index 00000000000..4aad7100d2d
--- /dev/null
+++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt
@@ -0,0 +1,5 @@
+package kotlin
+
+open class KFirst(): java.JFirst() {
+
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml
new file mode 100644
index 00000000000..864e89613d7
--- /dev/null
+++ b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+  </component>
+</module>
+
diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr
new file mode 100644
index 00000000000..90747786771
--- /dev/null
+++ b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java
new file mode 100644
index 00000000000..9efa068707f
--- /dev/null
+++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java
@@ -0,0 +1,4 @@
+package java;
+
+public class JFirst extends kotlin.KFirst {
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt
new file mode 100644
index 00000000000..9e026a45f77
--- /dev/null
+++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt
@@ -0,0 +1,6 @@
+package kotlin
+
+open class KFirst() {
+    fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt
new file mode 100644
index 00000000000..eec804c1b7b
--- /dev/null
+++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt
@@ -0,0 +1,7 @@
+package kotlin
+
+class KSecond(): java.JFirst() {
+    fun bar() {
+        foo()
+    }
+}
\ No newline at end of file