From d2e464a02bfba813b3397de9b94c3c545f5610dc Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 5 Jun 2014 14:36:13 +0400
Subject: [PATCH] Tests for local classes in weird positions

---
 .../functionAndProperty/localClassInClass.kt           |  8 ++++++++
 .../objectExpressionInConstructor.kt                   |  6 ++++++
 .../jet/checkers/JetDiagnosticsTestGenerated.java      | 10 ++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt
 create mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt

diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt
new file mode 100644
index 00000000000..0b0fcb9755c
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt
@@ -0,0 +1,8 @@
+class Outer {
+    fun foo() {
+        class C {
+            <!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
+            <!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
+        }
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt
new file mode 100644
index 00000000000..04c43b4528f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt
@@ -0,0 +1,6 @@
+class Outer {
+    val x = object {
+        <!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
+        <!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
+    }
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index d0b66602189..98cde72dc0d 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2699,6 +2699,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt");
                 }
                 
+                @TestMetadata("localClassInClass.kt")
+                public void testLocalClassInClass() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt");
+                }
+                
                 @TestMetadata("nestedClass.kt")
                 public void testNestedClass() throws Exception {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
@@ -2714,6 +2719,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
                 }
                 
+                @TestMetadata("objectExpressionInConstructor.kt")
+                public void testObjectExpressionInConstructor() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt");
+                }
+                
                 @TestMetadata("topLevel.kt")
                 public void testTopLevel() throws Exception {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt");