azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-05 14:33:25 +04:00
parent 55cfa161c7
commit 9cb71c7fa8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt
+1 -1
View File
@@ -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 component1()<!> = 1
<!CONFLICTING_OVERLOADS!>fun component2()<!> = 2 <!CONFLICTING_OVERLOADS!>fun component2()<!> = 2
} }
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt → compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER // !DIAGNOSTICS: -UNUSED_PARAMETER
data class C(val c: Int) { data class <!CONFLICTING_JVM_DECLARATIONS!>C(val c: Int)<!> {
<!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = 1 <!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = C(this.c)
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt
+2 -2
View File
@@ -26,9 +26,9 @@ var varx: Int
set(v) {} set(v) {}
var vardef: Int = 1 var vardef: Int = 1
[platformName("f")] [platformName("h")]
get get
[platformName("g")] [platformName("i")]
set set
[<!INAPPLICABLE_ANNOTATION!>platformName("C")<!>] [<!INAPPLICABLE_ANNOTATION!>platformName("C")<!>]
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+3 -3
View File
@@ -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); 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") @TestMetadata("dataClassCopy.kt")
public void testComponentInheritedFromTrait() throws Exception { public void testDataClassCopy() throws Exception {
doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt"); doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt");
} }
@TestMetadata("defaults.kt") @TestMetadata("defaults.kt")