From 0ea69dea95f730be46be395839db3b93e25375bd Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 28 Jan 2015 15:36:09 +0300
Subject: [PATCH] Update duplicate jvm signature test for class objects

---
 .../tests/duplicateJvmSignature/specialNames/classObject.kt | 4 ++--
 .../duplicateJvmSignature/specialNames/classObject.txt      | 2 +-
 .../specialNames/classObjectCopiedFieldObject.kt            | 6 +++---
 .../specialNames/classObjectCopiedFieldObject.txt           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
index 938d52795bb..fd43f9a43bd 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
@@ -1,5 +1,5 @@
 class C {
-    <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
+    <!REDECLARATION!>class object<!> {}
 
-    <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = C
+    val <!REDECLARATION!>Default<!> = C
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
index a1fdef385bd..248b9f35155 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
@@ -2,7 +2,7 @@ package
 
 internal final class C {
     public constructor C()
-    internal final val `OBJECT$`: C.Default
+    internal final val Default: C.Default
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
index 6d38590ee26..2471324107a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
@@ -1,7 +1,7 @@
 class C {
-    <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
-        <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
+    <!REDECLARATION!>class object<!> {
+        val <!REDECLARATION!>Default<!> = this
     }
 
-    val `OBJECT$` = C
+    val <!REDECLARATION!>Default<!> = C
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
index 4652ad82703..75eae1ea90f 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
@@ -2,14 +2,14 @@ package
 
 internal final class C {
     public constructor C()
-    internal final val `OBJECT$`: C.Default
+    internal final val Default: C.Default
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal class object Default {
         private constructor Default()
-        internal final val `OBJECT$`: C.Default
+        internal final val Default: C.Default
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String