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

[TD] Update diagnostics test data due to new test runners

Browse Source 
Update includes:
- Changing syntax of `OI/`NI` tags from `<!NI;TAG!>` to `<!TAG{NI}!>`
- Fix some incorrect directives
- Change order of diagnostics in some places
- Remove ignored diagnostics from FIR test data (previously `DIAGNOSTICS` didn't work)
- Update FIR dumps in some places and add `FIR_IDENTICAL` if needed
- Replace all JAVAC_SKIP with SKIP_JAVAC directive
This commit is contained in:
Dmitriy Novozhilov
2020-12-07 10:08:56 +03:00
parent 1d04fecd29
commit e6b5cb5216
1823 changed files with 3014 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.kt
Vendored
+8 -8
View File
@@ -22,24 +22,24 @@ import j.JavaProtected
import j.JavaPackageLocal
class A {
val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
val p2 = JavaProtected.<!INVISIBLE_MEMBER("javaPProtectedStatic", "protected", "'JavaProtected'")!>javaPProtectedStatic<!>
val p3 = JavaProtected().<!INVISIBLE_MEMBER("javaPProtectedPackage", "protected", "'JavaProtected'")!>javaPProtectedPackage<!>
val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage; package-private; 'JavaPackageLocal'")!>javaPPackage<!>
val p2 = JavaProtected.<!INVISIBLE_MEMBER("javaPProtectedStatic; protected; 'JavaProtected'")!>javaPProtectedStatic<!>
val p3 = JavaProtected().<!INVISIBLE_MEMBER("javaPProtectedPackage; protected; 'JavaProtected'")!>javaPProtectedPackage<!>
fun test() {
JavaProtected.<!INVISIBLE_MEMBER("javaMProtectedStatic", "protected", "'JavaProtected'")!>javaMProtectedStatic<!>()
JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
JavaProtected.<!INVISIBLE_MEMBER("javaMProtectedStatic; protected; 'JavaProtected'")!>javaMProtectedStatic<!>()
JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage; package-private; 'JavaPackageLocal'")!>javaMPackage<!>()
}
}
class B : JavaProtected() {
val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage; package-private; 'JavaPackageLocal'")!>javaPPackage<!>
val p2 = JavaProtected.javaPProtectedStatic
val p3 = javaPProtectedPackage
fun test() {
JavaProtected.javaMProtectedStatic()
JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage; package-private; 'JavaPackageLocal'")!>javaMPackage<!>()
}
}
@@ -59,4 +59,4 @@ class C {
JavaProtected.javaMProtectedStatic()
JavaPackageLocal.javaMPackage()
}
}
}
compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ package k {
}
}
// -- Module: <m2> --
package
compiler/testData/diagnostics/tests/imports/ClassClash.txt
Vendored
+1 -5
View File
@@ -12,7 +12,6 @@ package a {
}
}
// -- Module: <m2> --
package
@@ -27,13 +26,11 @@ package a {
}
}
// -- Module: <m3> --
package
public fun test(/*0*/ b: a.B): kotlin.Unit
// -- Module: <top_m1> --
package
@@ -45,7 +42,6 @@ public final class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// -- Module: <top_m2> --
package
@@ -57,9 +53,9 @@ public final class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// -- Module: <top_m3> --
package
public fun test(/*0*/ b: B): kotlin.Unit
public fun test2(/*0*/ b: B): kotlin.Unit
compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
Vendored
+1 -1
View File
@@ -73,4 +73,4 @@ fun test(b: B) {
val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>B<!>()
b_4.<!UNRESOLVED_REFERENCE!>m2<!>()
}
}
compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
Vendored
+3 -3
View File
@@ -71,6 +71,6 @@ fun test(b: B) {
val b_3 = B()
b_3.m2()
val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>B<!>()
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>m2<!>()
}
val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>B<!>()
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>m2<!>()
}
compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
Vendored
+1 -5
View File
@@ -12,7 +12,6 @@ package a {
}
}
// -- Module: <m2> --
package
@@ -27,13 +26,11 @@ package a {
}
}
// -- Module: <m3> --
package
public fun test(/*0*/ b: a.B): kotlin.Unit
// -- Module: <top_m1> --
package
@@ -45,7 +42,6 @@ public final class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// -- Module: <top_m2> --
package
@@ -57,8 +53,8 @@ public final class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// -- Module: <top_m3> --
package
public fun test(/*0*/ b: B): kotlin.Unit
compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.fir.kt
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@ fun foo(): Klass {
return Klass()
}
// FILE: anotherFromRootPackage.kt
// FILE: yetAnotherFromRootPackage.kt
package pkg
import Klass
@@ -29,4 +29,4 @@ fun foo(): Klass {
}
val v: Nested = Nested()
val x: NotImported = <!UNRESOLVED_REFERENCE!>NotImported<!>()
val x: NotImported = <!UNRESOLVED_REFERENCE!>NotImported<!>()
compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@ fun foo(): Klass {
return Klass()
}
// FILE: anotherFromRootPackage.kt
// FILE: yetAnotherFromRootPackage.kt
package pkg
import Klass
@@ -29,4 +29,4 @@ fun foo(): Klass {
}
val v: Nested = Nested()
val x: <!UNRESOLVED_REFERENCE!>NotImported<!> = <!UNRESOLVED_REFERENCE!>NotImported<!>()
val x: <!UNRESOLVED_REFERENCE!>NotImported<!> = <!UNRESOLVED_REFERENCE!>NotImported<!>()
compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
Vendored
+1 -1
View File
@@ -42,4 +42,4 @@ fun test() {
all()
all(1)
all("")
}
}
compiler/testData/diagnostics/tests/imports/ImportPrivateMember.kt
Vendored
+1 -1
View File
@@ -34,4 +34,4 @@ fun testAccess() {
<!INVISIBLE_MEMBER!>InNested<!>()
<!INVISIBLE_MEMBER!>NestedEntry<!>
inObject()
}
}
compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
// FIR_IDENTICAL
// FILE: b.kt
// FILE: a.kt
// KT-355 Resolve imports after all symbols are built
package a
@@ -12,12 +12,12 @@ package b
}
// FILE: b.kt
// FILE: c.kt
package c
import d.X
val x : X = X()
// FILE: b.kt
// FILE: d.kt
package d
class X() {
compiler/testData/diagnostics/tests/imports/Imports.fir.kt
Vendored
+1 -1
View File
@@ -99,4 +99,4 @@ class A() {
open class B() {}
object C : B() {}
}
}
}
compiler/testData/diagnostics/tests/imports/Imports.kt
Vendored
+2 -2
View File
@@ -82,7 +82,7 @@ object C {
}
fun foo() {
if (<!UNRESOLVED_REFERENCE!>i<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
}
//FILE:d.kt
@@ -99,4 +99,4 @@ class A() {
open class B() {}
object C : B() {}
}
}
}
compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@ package a
import pack1.*
private class X : <!INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>SomeClass<!>()
private class X : <!INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>SomeClass<!>()
compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
Vendored
+1 -3
View File
@@ -24,7 +24,6 @@ package a {
}
}
// -- Module: <m2> --
package
@@ -48,7 +47,6 @@ package a {
}
}
// -- Module: <m3> --
package
@@ -60,7 +58,6 @@ package a {
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
}
// -- Module: <m4> --
package
@@ -71,3 +68,4 @@ package a {
public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
}
compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ package a
import pack1.SomeClass.*
private class X : <!FINAL_SUPERTYPE, INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>N<!>()
private class X : <!FINAL_SUPERTYPE, INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>N<!>()
compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
Vendored
+1 -2
View File
@@ -21,7 +21,6 @@ package a {
}
}
// -- Module: <m2> --
package
@@ -43,10 +42,10 @@ public final class a {
}
}
// -- Module: <m3> --
package
public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ _a: a): kotlin.Unit
public fun test3(/*0*/ _a: a): kotlin.Unit
compiler/testData/diagnostics/tests/imports/WrongImport.fir.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
// FILE:a.kt
package a.b
// FILE:a.kt
// FILE:b.kt
package a
val foo = object {
@@ -47,7 +47,7 @@ class D {
}
// FILE:b.kt
// FILE:c.kt
import a
import a.b
@@ -75,4 +75,4 @@ import a.D.bar.foo
import a.D.Companion.foo
import a.D.Companion.foo.bar
import a.D.Companion.bar
import a.D.Companion.bar.foo
import a.D.Companion.bar.foo
compiler/testData/diagnostics/tests/imports/WrongImport.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
// FILE:a.kt
package a.b
// FILE:a.kt
// FILE:b.kt
package a
val foo = object {
@@ -47,7 +47,7 @@ class D {
}
// FILE:b.kt
// FILE:c.kt
import <!PACKAGE_CANNOT_BE_IMPORTED!>a<!>
import a.<!PACKAGE_CANNOT_BE_IMPORTED!>b<!>
@@ -75,4 +75,4 @@ import a.D.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!
import a.D.Companion.foo
import a.D.Companion.<!UNRESOLVED_REFERENCE!>foo<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!>
import a.D.Companion.bar
import a.D.Companion.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
import a.D.Companion.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ object B : C<String>()
open class C<T> {
private var foo: String = "abc"
}
}
compiler/testData/diagnostics/tests/imports/twoImportLists.kt
Vendored
+1 -1
View File
@@ -85,7 +85,7 @@ object C {
}
fun foo() {
if (<!UNRESOLVED_REFERENCE!>i<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
}
//FILE:d.kt