Added test with overridden j.l.Object methods in trait.

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()
+}

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");