From 9cb71c7fa8ed898f9447df4b56a950fb9260bed7 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 5 Jun 2014 14:33:25 +0400
Subject: [PATCH] Test data fixed

---
 .../diagnostics/tests/dataClasses/conflictingOverloads.kt   | 2 +-
 .../{componentInheritedFromTrait.kt => dataClassCopy.kt}    | 4 ++--
 .../annotations/annotationApplicability/platformName.kt     | 4 ++--
 .../jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/{componentInheritedFromTrait.kt => dataClassCopy.kt} (52%)

diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt
index 7f2d3ea85ad..e20e3462214 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt
@@ -1,4 +1,4 @@
-data class A(val x: Int, val y: String) {
+data class <!CONFLICTING_JVM_DECLARATIONS!>A(val x: Int, val y: String)<!> {
     <!CONFLICTING_OVERLOADS!>fun component1()<!> = 1
     <!CONFLICTING_OVERLOADS!>fun component2()<!> = 2
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt
similarity index 52%
rename from compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt
index 6f56e731a16..568ebb3ba7b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-data class C(val c: Int) {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = 1
+data class <!CONFLICTING_JVM_DECLARATIONS!>C(val c: Int)<!> {
+    <!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = C(this.c)
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt
index 70d765bf601..d70c3d6d8cb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt
@@ -26,9 +26,9 @@ var varx: Int
     set(v) {}
 
 var vardef: Int = 1
-    [platformName("f")]
+    [platformName("h")]
     get
-    [platformName("g")]
+    [platformName("i")]
     set
 
 [<!INAPPLICABLE_ANNOTATION!>platformName("C")<!>]
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index b7947f3f801..d0b66602189 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2742,9 +2742,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
                 
-                @TestMetadata("componentInheritedFromTrait.kt")
-                public void testComponentInheritedFromTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt");
+                @TestMetadata("dataClassCopy.kt")
+                public void testDataClassCopy() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt");
                 }
                 
                 @TestMetadata("defaults.kt")