From 652b9e78c3e1d347e85d0c4e3caca6fd9c15e8d3 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 4 May 2012 14:24:34 +0400
Subject: [PATCH] Tests for KT-1888  #KT-1888 fixed

---
 .../overrideImplement/overrideExplicitFunction.kt      |  7 +++++++
 .../overrideExplicitFunction.kt.after                  | 10 ++++++++++
 .../overrideImplement/overrideExplicitProperty.kt      |  7 +++++++
 .../overrideExplicitProperty.kt.after                  |  8 ++++++++
 .../jet/plugin/codeInsight/OverrideImplementTest.java  |  8 ++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
 create mode 100644 idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
 create mode 100644 idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt
 create mode 100644 idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt.after

diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
new file mode 100644
index 00000000000..023bac0af7f
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
@@ -0,0 +1,7 @@
+trait A {
+    fun String.foo()
+}
+
+class B : A {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
new file mode 100644
index 00000000000..38fbdc4e1b2
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -0,0 +1,10 @@
+trait A {
+    fun String.foo()
+}
+
+class B : A {
+
+    override fun String.foo() {
+        throw UnsupportedOperationException()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt b/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt
new file mode 100644
index 00000000000..8b4f22dcede
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt
@@ -0,0 +1,7 @@
+trait A {
+    val String.prop : Int
+}
+
+class B : A {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt.after
new file mode 100644
index 00000000000..2eb77db467b
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitProperty.kt.after
@@ -0,0 +1,8 @@
+trait A {
+    val String.prop : Int
+}
+
+class B : A {
+
+    override val String.prop : Int = 0
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
index 6ee8676eae6..342a3d6dd25 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
@@ -115,6 +115,14 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase {
         doMultiOverrideFileTest();
     }
 
+    public void testOverrideExplicitFunction() {
+        doOverrideFileTest();
+    }
+
+    public void testOverrideExplicitProperty() {
+        doOverrideFileTest();
+    }
+
     public void testComplexMultiOverride() {
         doMultiOverrideFileTest();
     }