Update testData for changed diagnostic messages

2017-05-25 10:58:12 +03:00
parent 17eab2865d
commit 7979663e6c
24 changed files with 98 additions and 98 deletions
@@ -1,46 +1,46 @@
 compiler/testData/cli/jvm/signatureClash.kt:6:5: error: accidental override: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): Int
-    fun getX(): Int
+    fun <get-x>(): Int defined in A
+    fun getX(): Int defined in A
    fun getX() = 1
    ^
 compiler/testData/cli/jvm/signatureClash.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
-    fun <get-a>(): Int
-    fun getA(): Int
+    fun <get-a>(): Int defined in A
+    fun getA(): Int defined in A
    fun getA(): Int = 1
    ^
 compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
-    fun <get-a>(): Int
-    fun getA(): Int
+    fun <get-a>(): Int defined in A
+    fun getA(): Int defined in A
    val a: Int = 1
    ^
 compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
-    fun <get-b>(): Int
-    fun getB(): Int
+    fun <get-b>(): Int defined in root package
+    fun getB(): Int defined in root package
 fun getB(): Int = 1
 ^
 compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
-    fun <get-b>(): Int
-    fun getB(): Int
+    fun <get-b>(): Int defined in root package
+    fun getB(): Int defined in root package
 val b: Int = 1
 ^
 compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
-    fun <get-tr>(): Int
-    fun getTr(): Int
+    fun <get-tr>(): Int defined in SubTr
+    fun getTr(): Int defined in Tr
 class SubTr : Tr {
      ^
 compiler/testData/cli/jvm/signatureClash.kt:20:5: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
-    fun <get-tr>(): Int
-    fun getTr(): Int
+    fun <get-tr>(): Int defined in SubTr
+    fun getTr(): Int defined in Tr
    val tr = 1
    ^
 compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
-    fun `access$f`(c: C): Unit
-    fun f(): Unit
+    fun `access$f`(c: C): Unit defined in C
+    fun f(): Unit defined in C
 class C {
      ^
 compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
-    fun `access$f`(c: C): Unit
-    fun f(): Unit
+    fun `access$f`(c: C): Unit defined in C
+    fun f(): Unit defined in C
    fun `access$f`(c: C) {}
    ^
 COMPILATION_ERROR
@@ -1,71 +1,71 @@
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(a: A): Int
+    fun <get-foo>(): Int defined in A
+    fun `access$getFoo$p`(a: A): Int defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(a: A, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A
+    fun `access$setFoo$p`(a: A, d: Int): Unit defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$cp`(): Int
+    fun <get-foo>(): Int defined in A.Companion
+    fun `access$getFoo$cp`(): Int defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$cp`(d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A.Companion
+    fun `access$setFoo$cp`(d: Int): Unit defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
-    fun <get-bar>(): Int
-    fun `access$getBar$lp`(a: A): Int
+    fun <get-bar>(): Int defined in A
+    fun `access$getBar$lp`(a: A): Int defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(a: A): Int
+    fun <get-foo>(): Int defined in A
+    fun `access$getFoo$p`(a: A): Int defined in A
    fun `access$getFoo$p`(a: A): Int = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(a: A, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A
+    fun `access$setFoo$p`(a: A, d: Int): Unit defined in A
    fun `access$setFoo$p`(a: A, d: Int) {}
    ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$cp`(): Int
+    fun <get-foo>(): Int defined in A.Companion
+    fun `access$getFoo$cp`(): Int defined in A
    fun `access$getFoo$cp`(): Int = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:10:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$cp`(d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A.Companion
+    fun `access$setFoo$cp`(d: Int): Unit defined in A
    fun `access$setFoo$cp`(d: Int) {}
    ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:16:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
-    fun <get-bar>(): Int
-    fun `access$getBar$lp`(a: A): Int
+    fun <get-bar>(): Int defined in A
+    fun `access$getBar$lp`(a: A): Int defined in A
    fun `access$getBar$lp`(a: A): Int = 7
    ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(p: A.Companion): Int
+    fun <get-foo>(): Int defined in A.Companion
+    fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion
    companion object {
              ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A.Companion
+    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion
    companion object {
              ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:28:9: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(p: A.Companion): Int
+    fun <get-foo>(): Int defined in A.Companion
+    fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion
        fun `access$getFoo$p`(p: A.Companion): Int = 1
        ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:29:9: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A.Companion
+    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion
        fun `access$setFoo$p`(p: A.Companion, d: Int) {}
        ^
 COMPILATION_ERROR
@@ -1,41 +1,41 @@
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(a: A): Int
+    fun <get-foo>(): Int defined in A
+    fun `access$getFoo$p`(a: A): Int defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(a: A, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A
+    fun `access$setFoo$p`(a: A, d: Int): Unit defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
-    fun `access$getFoo`(a: A): Int
-    fun getFoo(): Int
+    fun `access$getFoo`(a: A): Int defined in A
+    fun getFoo(): Int defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
-    fun `access$setFoo`(a: A, d: Int): Unit
-    fun setFoo(i: Int): Unit
+    fun `access$setFoo`(a: A, d: Int): Unit defined in A
+    fun setFoo(i: Int): Unit defined in A
 class A {
      ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): Int
-    fun `access$getFoo$p`(a: A): Int
+    fun <get-foo>(): Int defined in A
+    fun `access$getFoo$p`(a: A): Int defined in A
    fun `access$getFoo$p`(a: A): Int = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: Int): Unit
-    fun `access$setFoo$p`(a: A, d: Int): Unit
+    fun <set-foo>(<set-?>: Int): Unit defined in A
+    fun `access$setFoo$p`(a: A, d: Int): Unit defined in A
    fun `access$setFoo$p`(a: A, d: Int) {}
    ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:11:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
-    fun `access$getFoo`(a: A): Int
-    fun getFoo(): Int
+    fun `access$getFoo`(a: A): Int defined in A
+    fun getFoo(): Int defined in A
    fun `access$getFoo`(a: A): Int = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:12:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
-    fun `access$setFoo`(a: A, d: Int): Unit
-    fun setFoo(i: Int): Unit
+    fun `access$setFoo`(a: A, d: Int): Unit defined in A
+    fun setFoo(i: Int): Unit defined in A
    fun `access$setFoo`(a: A, d: Int) {}
    ^
 COMPILATION_ERROR
@@ -1,31 +1,31 @@
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V):
-    fun `access$foo`(d: Derived): Unit
-    fun foo(): Unit
+    fun `access$foo`(d: Derived): Unit defined in Derived
+    fun foo(): Unit defined in Derived
    private fun foo() {}
    ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I):
-    fun <get-bar>(): Int
-    fun `access$getBar$p`(d: Derived): Int
+    fun <get-bar>(): Int defined in Derived
+    fun `access$getBar$p`(d: Derived): Int defined in Derived
        get
        ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V):
-    fun <set-bar>(<set-?>: Int): Unit
-    fun `access$setBar$p`(d: Derived, i: Int): Unit
+    fun <set-bar>(<set-?>: Int): Unit defined in Derived
+    fun `access$setBar$p`(d: Derived, i: Int): Unit defined in Derived
        set
        ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I):
-    fun <get-baz>(): Int
-    fun `access$getBaz$p`(d: Derived): Int
+    fun <get-baz>(): Int defined in Derived
+    fun `access$getBaz$p`(d: Derived): Int defined in Derived
    private var baz = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I):
-    fun <get-boo>(): Int
-    fun `access$getBoo$p`(d: Derived): Int
+    fun <get-boo>(): Int defined in Derived
+    fun `access$getBoo$p`(d: Derived): Int defined in Derived
    private val boo = 1
    ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V):
-    fun <set-bar1>(<set-?>: Int): Unit
-    fun `access$setBar1$p`(d: Derived, i: Int): Unit
+    fun <set-bar1>(<set-?>: Int): Unit defined in Derived
+    fun `access$setBar1$p`(d: Derived, i: Int): Unit defined in Derived
        set
        ^
 COMPILATION_ERROR
@@ -1,2 +1,2 @@
 <!-- abstractBaseClassMemberNotImplemented1 -->
-Class 'E' must be declared abstract or implement abstract base class member public abstract fun f(): T4 defined in D
+Class 'E' is not abstract and does not implement abstract base class member public abstract fun f(): T4 defined in D
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): Int defined in B
+// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract fun foo(): Int defined in B
 interface A {
    fun <caret>foo(): Int
 }
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
+// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract val foo: Int defined in B
 interface A {
    val <caret>foo: Int
 }
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
+// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract val foo: Int defined in B
 interface A {
    val <caret>foo: Int
 }
@@ -1,6 +1,6 @@
 // "Make 'A' abstract" "false"
 // ACTION: Implement members
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in E
+// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in E

 enum class E {
    <caret>A;
@@ -3,7 +3,7 @@
 // ACTION: Make private
 // ACTION: Make protected
 // ACTION: Make 'n' abstract
-// ERROR: Property must be initialized or be abstract
+// ERROR: Extension property must have accessors or be abstract
 class A {
    <caret>val Int.n: Int
 }
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.InitializePropertyQuickFixFactory$AddInitializerFix" "false"
 // ACTION: Make internal
 // ACTION: Make private
-// ERROR: Property must be initialized
+// ERROR: Extension property must have accessors or be abstract
 <caret>val Int.n: Int
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.InitializePropertyQuickFixFactory$AddInitializerFix" "false"
 // ACTION: Make internal
 // ACTION: Make private
-// ERROR: Property must be initialized
+// ERROR: Extension property must have accessors or be abstract
 <caret>val Int.n: Int
@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "true"
-// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
+// ERROR: Class 'Foo' is not abstract and does not implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty

 open class B

@@ -1,7 +1,7 @@
 import kotlin.properties.ReadOnlyProperty

 // "Create class 'Foo'" "true"
-// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
+// ERROR: Class 'Foo' is not abstract and does not implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty

 open class B

@@ -2,7 +2,7 @@
 // ACTION: Implement members
 // ACTION: Split property declaration
 // ACTION: Convert object literal to class
-// ERROR: Object must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T
+// ERROR: Object is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in T
 interface T {
    fun foo()
 }
@@ -3,7 +3,7 @@
 // ACTION: Implement members
 // ACTION: Move 'Some' to separate file
 // ACTION: Rename file to Some.kt
-// ERROR: Object 'Some' must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T
+// ERROR: Object 'Some' is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in T
 interface T {
    fun foo()
 }
@@ -3,7 +3,7 @@
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Make protected
-// ERROR: Property must be initialized or be abstract
+// ERROR: Extension property must have accessors or be abstract
 class A {
    <caret>val Int.n: Int
 }
@@ -5,7 +5,7 @@
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Move 'A' to separate file
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): Int defined in I
+// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): Int defined in I
 interface I {
    fun foo(): Int
 }
@@ -4,7 +4,7 @@
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Move 'A' to separate file
-// ERROR: Object 'A' must be declared abstract or implement abstract member public abstract val foo: Int defined in I
+// ERROR: Object 'A' is not abstract and does not implement abstract member public abstract val foo: Int defined in I
 interface I {
    val foo: Int
 }
@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A
+// ERROR: Class 'B' is not abstract and does not implement abstract member public abstract fun f(a: String): Unit defined in A
 interface A {
    fun f(a: Int)
    fun f(a: String)
@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A
+// ERROR: Class 'B' is not abstract and does not implement abstract member public abstract fun f(a: String): Unit defined in A
 interface A {
    fun f(a: Int)
    fun f(a: String)
@@ -1,4 +1,4 @@
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable
+// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable
 package foo

 // we use package 'foo'
@@ -19,7 +19,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C<Any>): Unit defined in A
+Class 'BA' is not abstract and does not implement abstract member public abstract fun f(c: C<Any>): Unit defined in A

 ================ Step #2 =================

@@ -31,4 +31,4 @@ Compiling files:
  src/BA.kt
 End of files
 Exit code: OK
------------------------------------------
+------------------------------------------
@@ -12,8 +12,8 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: List<Any>): Unit
-    fun function(list: List<String>): Unit
+    fun function(list: List<Any>): Unit defined in test
+    fun function(list: List<String>): Unit defined in test
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: List<Any>): Unit
-    fun function(list: List<String>): Unit
+    fun function(list: List<Any>): Unit defined in test
+    fun function(list: List<String>): Unit defined in test