From 9015ce29c2c4ec02e260d861aeb99ffb8936e34b Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 4 Feb 2012 11:59:57 +0400
Subject: [PATCH] diamond inheritance in JetDiagnosticsTest

---
 .../testData/diagnostics/tests/DiamondFunction.jet     |  9 +++++++++
 .../testData/diagnostics/tests/DiamondProperty.jet     | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/DiamondFunction.jet
 create mode 100644 compiler/testData/diagnostics/tests/DiamondProperty.jet

diff --git a/compiler/testData/diagnostics/tests/DiamondFunction.jet b/compiler/testData/diagnostics/tests/DiamondFunction.jet
new file mode 100644
index 00000000000..b22834a1978
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/DiamondFunction.jet
@@ -0,0 +1,9 @@
+open class Base() {
+    fun f() = 1
+}
+    
+open class Left() : Base()
+
+trait Right : Base
+
+class Diamond() : Left(), Right
diff --git a/compiler/testData/diagnostics/tests/DiamondProperty.jet b/compiler/testData/diagnostics/tests/DiamondProperty.jet
new file mode 100644
index 00000000000..0f6099b0bf9
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/DiamondProperty.jet
@@ -0,0 +1,10 @@
+
+open class Base() {
+    var v : Int = 0
+}
+    
+open class Left() : Base()
+
+trait Right : Base
+
+class Diamond() : Left(), Right