From dadc8351b61be2c0f8f85f45f85799fa6d340c8e Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 28 Mar 2014 21:28:43 +0400
Subject: [PATCH] Added tests for compiling Java against TraitImpl and
 extension members.

---
 .../method/Extensions.java                        |  9 +++++++++
 .../compileJavaAgainstKotlin/method/Extensions.kt |  7 +++++++
 .../method/TraitImpl.java                         | 11 +++++++++++
 .../compileJavaAgainstKotlin/method/TraitImpl.kt  |  9 +++++++++
 .../property/Extensions.java                      | 10 ++++++++++
 .../property/Extensions.kt                        |  9 +++++++++
 .../CompileJavaAgainstKotlinTestGenerated.java    | 15 +++++++++++++++
 7 files changed, 70 insertions(+)
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/Extensions.java
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.java
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/property/Extensions.java
 create mode 100644 compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt

diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java
new file mode 100644
index 00000000000..70daa575cdd
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java
@@ -0,0 +1,9 @@
+package test;
+
+class GenericArray {
+    {
+        TestPackage.noParam("");
+
+        TestPackage.param("", "");
+    }
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt
new file mode 100644
index 00000000000..f188c7894d6
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt
@@ -0,0 +1,7 @@
+package test
+
+fun String.noParam() {
+}
+
+fun String.param(p: String) {
+}
\ No newline at end of file
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.java b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.java
new file mode 100644
index 00000000000..6de13515595
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.java
@@ -0,0 +1,11 @@
+package test;
+
+import java.util.ArrayList;
+
+abstract class TraitImpl implements Trait {
+    {
+        Trait$$TImpl.simple(this);
+
+        Trait$$TImpl.generic(this, new ArrayList<String>());
+    }
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt
new file mode 100644
index 00000000000..8f12a0bf590
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt
@@ -0,0 +1,9 @@
+package test
+
+trait Trait {
+    fun simple() {
+    }
+
+    fun generic(list: List<String>) {
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java
new file mode 100644
index 00000000000..edcc350ed20
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java
@@ -0,0 +1,10 @@
+package test;
+
+class GenericArray {
+    {
+        TestPackage.getVal_("");
+
+        TestPackage.getVar_("");
+        TestPackage.setVar_("", "");
+    }
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt
new file mode 100644
index 00000000000..e68d2daa6a1
--- /dev/null
+++ b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt
@@ -0,0 +1,9 @@
+package test
+
+val String.val_: String
+    get() = ""
+
+var String.var_: String
+    get() = ""
+    set(value) {
+    }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
index 70bee054eb6..31528f5a171 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
@@ -142,6 +142,11 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             doTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
         }
         
+        @TestMetadata("Extensions.kt")
+        public void testExtensions() throws Exception {
+            doTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+        }
+        
         @TestMetadata("GenericArray.kt")
         public void testGenericArray() throws Exception {
             doTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
@@ -207,6 +212,11 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             doTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
         }
         
+        @TestMetadata("TraitImpl.kt")
+        public void testTraitImpl() throws Exception {
+            doTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+        }
+        
         @TestMetadata("Vararg.kt")
         public void testVararg() throws Exception {
             doTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
@@ -338,6 +348,11 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), true);
         }
         
+        @TestMetadata("Extensions.kt")
+        public void testExtensions() throws Exception {
+            doTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+        }
+        
         @TestMetadata("GenericProperty.kt")
         public void testGenericProperty() throws Exception {
             doTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");