From 2c2ec508d39e4675c5a9edbc02e29506ae048913 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 29 Jun 2015 13:07:10 +0300
Subject: [PATCH] Redeclaration tests patched

---
 .../testData/diagnostics/tests/classObjects/ClassObjects.kt     | 1 +
 .../diagnostics/tests/classObjects/classObjectRedeclaration.kt  | 1 +
 .../tests/declarationChecks/illegalModifiersOnClass.kt          | 2 +-
 .../diagnostics/tests/duplicateJvmSignature/missingNames.kt     | 1 +
 compiler/testData/diagnostics/tests/recovery/namelessMembers.kt | 2 +-
 .../diagnostics/tests/redeclarations/RedeclarationsInObjects.kt | 1 +
 compiler/testData/diagnostics/tests/redeclarations/kt2438.kt    | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
index cdc94614a12..95191baeb53 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
 package Jet86
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
index a42df203d13..2e688e71480 100644
--- a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
 package test
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
index 7d89c18274d..21f9b743c2e 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -MANY_COMPANION_OBJECTS -REDECLARATION
+// !DIAGNOSTICS: -MANY_COMPANION_OBJECTS -REDECLARATION -DUPLICATE_CLASS_NAMES
 
 // KT-3464 Front-end shouldn't allow override modifier in class declaration
 
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
index fb9c341bb22..0c666777f67 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
 <!FUNCTION_DECLARATION_WITH_NO_NAME!>fun ()<!> {
 
 }
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.kt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.kt
index 4b7f5dd3d55..1c488065a92 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.kt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -REDECLARATION
+// !DIAGNOSTICS: -REDECLARATION -DUPLICATE_CLASS_NAMES
 
 class C {
     <!FUNCTION_DECLARATION_WITH_NO_NAME!>fun ()<!> {
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt
index 5d1a7bfc92a..7469947ed69 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
 // KT-3525
 object B {
     class <!REDECLARATION!>C<!>
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt b/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
index f3999c352f8..efb790f6394 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
 //KT-2438 Prohibit inner classes with the same name
 
 package kt2438