From c619685dc8c1e77408aa54092fc56de0f0890f3e Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 27 Mar 2013 19:15:58 +0400
Subject: [PATCH] Added test with overridden j.l.Object methods in trait.

---
 .../testData/diagnostics/tests/TraitOverrideObjectMethods.kt | 5 +++++
 .../jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java  | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt

diff --git a/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt b/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt
new file mode 100644
index 00000000000..92411590a8f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt
@@ -0,0 +1,5 @@
+trait MyTrait: <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Object<!> {
+    override fun toString(): String
+    public override fun finalize()
+    public <!OVERRIDING_FINAL_MEMBER!>override<!> fun wait()
+}
\ 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 e21794dcb68..2b390194810 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -459,6 +459,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.kt");
         }
         
+        @TestMetadata("TraitOverrideObjectMethods.kt")
+        public void testTraitOverrideObjectMethods() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt");
+        }
+        
         @TestMetadata("TraitSupertypeList.kt")
         public void testTraitSupertypeList() throws Exception {
             doTest("compiler/testData/diagnostics/tests/TraitSupertypeList.kt");