From b443f605ed2e5a1f58c733e7847692afaffe7fb5 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 11 Dec 2015 13:03:59 +0300
Subject: [PATCH] Minor. Add load-java test checking that
 SamAdapterOverridabilityCondition is on

---
 .../compiledJava/sam/StaticOverrides.java     | 15 +++++++++++++
 .../compiledJava/sam/StaticOverrides.txt      | 21 +++++++++++++++++++
 .../jvm/compiler/LoadJavaTestGenerated.java   |  6 ++++++
 3 files changed, 42 insertions(+)
 create mode 100644 compiler/testData/loadJava/compiledJava/sam/StaticOverrides.java
 create mode 100644 compiler/testData/loadJava/compiledJava/sam/StaticOverrides.txt

diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.java b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.java
new file mode 100644
index 00000000000..d9cbe139bcd
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.java
@@ -0,0 +1,15 @@
+package test;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+
+public final class StaticOverrides {
+    public static class A {
+        static public void foo(Function0<Unit> x) {}
+    }
+
+    public static class B extends A {
+        // SAM adapter should not override A.foo
+        static public void foo(Runnable x) {}
+    }
+}
diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.txt b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.txt
new file mode 100644
index 00000000000..0cc20700498
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.txt
@@ -0,0 +1,21 @@
+package test
+
+public final class StaticOverrides {
+    public constructor StaticOverrides()
+
+    public open class A {
+        public constructor A()
+
+        // Static members
+        public open fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
+    }
+
+    public open class B : test.StaticOverrides.A {
+        public constructor B()
+
+        // Static members
+        public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
+        public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
+        public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
index 2beb5328609..91a5617c03a 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
@@ -1398,6 +1398,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestCompiledJava(fileName);
             }
 
+            @TestMetadata("StaticOverrides.java")
+            public void testStaticOverrides() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/StaticOverrides.java");
+                doTestCompiledJava(fileName);
+            }
+
             @TestMetadata("SubstitutedSamInterface.java")
             public void testSubstitutedSamInterface() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java");