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/scopes/VisibilityInClassObject.kt
Vendored
+1 -1
View File
@@ -30,4 +30,4 @@ class B: A() {
devNull(A.<!INVISIBLE_MEMBER!>private_val<!>)
devNull(A.<!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>protected_val<!>)
}
}
}
compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt
Vendored
+1 -1
View File
@@ -82,4 +82,4 @@ interface Q : R {
class S : P, Q {
<!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt
Vendored
+1 -1
View File
@@ -38,4 +38,4 @@ class C: B(), A {
B.Companion.B_()
C.<!UNRESOLVED_REFERENCE!>B_<!>()
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt
Vendored
+1 -1
View File
@@ -49,4 +49,4 @@ class D: C() {
C.<!UNRESOLVED_REFERENCE!>B_<!>()
D.<!UNRESOLVED_REFERENCE!>B_<!>()
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt
Vendored
+1 -1
View File
@@ -36,4 +36,4 @@ class C: A() {
<!DEPRECATED_ACCESS_BY_SHORT_NAME!>B()<!>
}
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt
Vendored
+1 -1
View File
@@ -92,4 +92,4 @@ class C: A() {
Z().C_C_Z()
Z().<!UNRESOLVED_REFERENCE!>A_C_Z<!>()
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt
Vendored
+1 -1
View File
@@ -44,4 +44,4 @@ class Y: C() {
<!DEPRECATED_ACCESS_BY_SHORT_NAME!>Z()<!>.A_C_Z()
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt
Vendored
+1 -1
View File
@@ -35,4 +35,4 @@ class B: A() {
<!DEPRECATED_ACCESS_BY_SHORT_NAME!>Y()<!>.A_C_Y()
<!DEPRECATED_ACCESS_BY_SHORT_NAME!>Y()<!>.<!UNRESOLVED_REFERENCE!>T_Y<!>()
}
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class D extends K {
static void bar() {}
}
// FILE: K.kt
// FILE: K2.kt
class K2 {
companion object {
compiler/testData/diagnostics/tests/scopes/kt1080.kt
Vendored
+1 -1
View File
@@ -16,4 +16,4 @@ class Some: <!UNRESOLVED_REFERENCE!>Test<!>()
package b.d
public open class Test
public open class Test
compiler/testData/diagnostics/tests/scopes/kt1244.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ class B() {
init {
A().<!INVISIBLE_MEMBER!>a<!> = "Hello"
}
}
}
compiler/testData/diagnostics/tests/scopes/kt151.kt
Vendored
+1 -1
View File
@@ -37,4 +37,4 @@ class F : C(), T {
class G : C(), T {
public override fun foo() {}
}
}
compiler/testData/diagnostics/tests/scopes/kt1738.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@ class A(private var i: Int, var j: Int) {
fun test(a: A) {
a.<!INVISIBLE_MEMBER!>i<!>++
a.j++
}
}
compiler/testData/diagnostics/tests/scopes/kt1805.kt
Vendored
+1 -1
View File
@@ -17,4 +17,4 @@ fun test() {
val s1 = SomeSubclass()
s1.<!INVISIBLE_MEMBER!>privateField<!> // 3. Unresolved reference
}
}
compiler/testData/diagnostics/tests/scopes/kt1806.kt
Vendored
+1 -1
View File
@@ -21,4 +21,4 @@ class Test {
}
}
fun doSmth(s: String) = s
fun doSmth(s: String) = s
compiler/testData/diagnostics/tests/scopes/kt37.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ fun box(): String {
val c = C()
if (c.<!INVISIBLE_MEMBER!>f<!> != 610) return "fail"
return "OK"
}
}
compiler/testData/diagnostics/tests/scopes/kt9430.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ class C: A() {
class D {
fun qux() { B().<!INVISIBLE_MEMBER!>foo<!>() }
}
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ class B : A() {
}
if (d.x is B) {
<!OI;SMARTCAST_IMPOSSIBLE!>d.x<!>.<!NI;INVISIBLE_MEMBER!>foo<!> {}
<!SMARTCAST_IMPOSSIBLE{OI}!>d.x<!>.<!INVISIBLE_MEMBER{NI}!>foo<!> {}
}
}
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ class Derived : BaseOuter() {
fun test(foo: Foo) {
if (foo.base is Derived) {
foo.base.foo() checkType { _<String>() } // Resolved to extension
<!OI;SMARTCAST_IMPOSSIBLE!>foo.base<!>.<!NI;INVISIBLE_MEMBER!>bar<!>()
<!SMARTCAST_IMPOSSIBLE{OI}!>foo.base<!>.<!INVISIBLE_MEMBER{NI}!>bar<!>()
}
}
}
compiler/testData/diagnostics/tests/scopes/visibility.kt
Vendored
+5 -5
View File
@@ -40,8 +40,8 @@ class B {
}
fun test3(a: A) {
a.<!INVISIBLE_MEMBER("v", "private", "'A'")!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER("f", "private", "'A'")!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
a.<!INVISIBLE_MEMBER("v; private; 'A'")!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER("f; private; 'A'")!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
}
interface T
@@ -54,7 +54,7 @@ open class C : T {
}
fun test4(c: C) {
c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>++
c.<!INVISIBLE_MEMBER("i; protected; 'C'")!>i<!>++
}
class D : C() {
@@ -78,7 +78,7 @@ class F : C() {
class G : T {
fun test8(c: C) {
doSmth(c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>)
doSmth(c.<!INVISIBLE_MEMBER("i; protected; 'C'")!>i<!>)
}
}
@@ -91,5 +91,5 @@ import test_visibility.*
fun test() {
internal_fun()
<!INVISIBLE_MEMBER("private_fun", "private", "file")!>private_fun<!>()
<!INVISIBLE_MEMBER("private_fun; private; file")!>private_fun<!>()
}
compiler/testData/diagnostics/tests/scopes/visibility2.kt
Vendored
+9 -9
View File
@@ -17,23 +17,23 @@ private object PO {}
//+JDK
package b
import a.<!INVISIBLE_REFERENCE("A", "private", "file")!>A<!>
import a.<!INVISIBLE_REFERENCE("foo", "private", "file")!>foo<!>
import a.<!INVISIBLE_REFERENCE("A; private; file")!>A<!>
import a.<!INVISIBLE_REFERENCE("foo; private; file")!>foo<!>
import a.makeA
import a.<!INVISIBLE_REFERENCE("PO", "private", "file")!>PO<!>
import a.<!INVISIBLE_REFERENCE("PO; private; file")!>PO<!>
fun test() {
val y = makeA()
y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
<!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
y.<!INVISIBLE_MEMBER("A; private; file")!>bar<!>()
<!INVISIBLE_MEMBER("foo; private; file")!>foo<!>()
val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
val a : java.util.Arrays.<!INVISIBLE_REFERENCE("ArrayList", "private", "'Arrays'")!>ArrayList<!><Int>;
val u : <!INVISIBLE_REFERENCE("A; private; file")!>A<!> = <!INVISIBLE_MEMBER("A; private; file")!>A<!>()
val a : java.util.Arrays.<!INVISIBLE_REFERENCE("ArrayList; private; 'Arrays'")!>ArrayList<!><Int>;
val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
val po = <!INVISIBLE_MEMBER("PO; private; file")!>PO<!>
}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A; private; file"), INVISIBLE_REFERENCE("A; private; file")!>A<!>()<!> {}
class Q {
class W {
compiler/testData/diagnostics/tests/scopes/visibility3.kt
Vendored
+7 -7
View File
@@ -25,18 +25,18 @@ package a
fun test() {
val y = makeA()
y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
<!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
y.<!INVISIBLE_MEMBER("A; private; file")!>bar<!>()
<!INVISIBLE_MEMBER("foo; private; file")!>foo<!>()
val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
val u : <!INVISIBLE_REFERENCE("A; private; file")!>A<!> = <!INVISIBLE_MEMBER("A; private; file")!>A<!>()
val z = <!INVISIBLE_MEMBER("x", "private", "file")!>x<!>
<!INVISIBLE_MEMBER("x", "private", "file")!>x<!> = 30
val z = <!INVISIBLE_MEMBER("x; private; file")!>x<!>
<!INVISIBLE_MEMBER("x; private; file")!>x<!> = 30
val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
val po = <!INVISIBLE_MEMBER("PO; private; file")!>PO<!>
}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A; private; file"), INVISIBLE_REFERENCE("A; private; file")!>A<!>()<!> {}
class Q {
class W {