From 9f29a8b263484cea06aa354e0e2668d370f19c59 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 17 Jun 2014 17:43:38 +0400
Subject: [PATCH] Test for required class

---
 .../duplicateJvmSignature/accidentalOverrides/require.kt   | 7 +++++++
 .../jet/checkers/JetDiagnosticsTestGenerated.java          | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt

diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt
new file mode 100644
index 00000000000..5e7f5d2fa85
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt
@@ -0,0 +1,7 @@
+open class C {
+    val x = 1
+}
+
+trait Tr : C {
+    <!ACCIDENTAL_OVERRIDE!>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 8e3c985fb25..d726279681c 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2603,6 +2603,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
                 }
                 
+                @TestMetadata("require.kt")
+                public void testRequire() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
+                }
+                
                 @TestMetadata("traitFunctionOverriddenByProperty.kt")
                 public void testTraitFunctionOverriddenByProperty() throws Exception {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt");