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

Minor: fix testdata

Browse Source
This commit is contained in:
Zalim Bashorov
2015-09-30 23:08:31 +03:00
parent 9256682cc5
commit 073b10072a
16 changed files with 89 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/visibility.kt
Vendored
+9 -7
View File
@@ -1,3 +1,5 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
//FILE:a.kt
package test_visibility
@@ -26,7 +28,7 @@ class Y {
class A {
private val i = 23
private val v: B = B()
private fun f(<!UNUSED_PARAMETER!>i<!>: Int): B = B()
private fun f(i: Int): B = B()
fun test() {
doSmth(i)
@@ -38,8 +40,8 @@ class B {
}
fun test3(a: A) {
a.<!INVISIBLE_MEMBER!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER!>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
@@ -52,7 +54,7 @@ open class C : T {
}
fun test4(c: C) {
c.<!INVISIBLE_MEMBER!>i<!>++
c.<!INVISIBLE_MEMBER(i; protected; 'C')!>i<!>++
}
class D : C() {
@@ -76,7 +78,7 @@ class F : C() {
class G : T {
fun test8(c: C) {
doSmth(c.<!INVISIBLE_MEMBER!>i<!>)
doSmth(c.<!INVISIBLE_MEMBER(i; protected; 'C')!>i<!>)
}
}
@@ -89,5 +91,5 @@ import test_visibility.*
fun test() {
internal_fun()
<!INVISIBLE_MEMBER!>private_fun<!>()
}
<!INVISIBLE_MEMBER(private_fun; private; file)!>private_fun<!>()
}
compiler/testData/diagnostics/tests/scopes/visibility2.kt
Vendored
+13 -11
View File
@@ -1,3 +1,5 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
//FILE:a.kt
package a
@@ -15,28 +17,28 @@ private object PO {}
//+JDK
package b
import a.<!INVISIBLE_REFERENCE!>A<!>
import a.<!INVISIBLE_REFERENCE!>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<!>
import a.<!INVISIBLE_REFERENCE(PO; private; file)!>PO<!>
fun test() {
val y = makeA()
y.<!INVISIBLE_MEMBER!>bar<!>()
<!INVISIBLE_MEMBER!>foo<!>()
y.<!INVISIBLE_MEMBER(A; private; file)!>bar<!>()
<!INVISIBLE_MEMBER(foo; private; file)!>foo<!>()
val <!UNUSED_VARIABLE!>u<!> : <!INVISIBLE_REFERENCE!>A<!> = <!INVISIBLE_MEMBER!>A<!>()
val <!UNUSED_VARIABLE!>a<!> : java.util.Arrays.<!INVISIBLE_REFERENCE!>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 <!UNUSED_VARIABLE!>po<!> = <!INVISIBLE_MEMBER!>PO<!>
val po = <!INVISIBLE_MEMBER(PO; private; file)!>PO<!>
}
class B : <!INVISIBLE_REFERENCE, INVISIBLE_MEMBER!>A<!>() {}
class B : <!INVISIBLE_REFERENCE(A; private; file), INVISIBLE_MEMBER(A; private; file)!>A<!>() {}
class Q {
class W {
fun foo() {
val <!UNUSED_VARIABLE!>y<!> = makeA() //assure that 'makeA' is visible
val y = makeA() //assure that 'makeA' is visible
}
}
}
@@ -44,4 +46,4 @@ class Q {
//check that 'toString' can be invoked without specifying return type
class NewClass : java.util.ArrayList<<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Integer<!>>() {
public override fun toString() = "a"
}
}
compiler/testData/diagnostics/tests/scopes/visibility3.kt
Vendored
+8 -8
View File
@@ -25,18 +25,18 @@ package a
fun test() {
val y = makeA()
y.<!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>bar<!>()
<!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>foo<!>()
y.<!INVISIBLE_MEMBER(A; private; file)!>bar<!>()
<!INVISIBLE_MEMBER(foo; private; file)!>foo<!>()
val u : <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>A<!> = <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>A<!>()
val u : <!INVISIBLE_REFERENCE(A; private; file)!>A<!> = <!INVISIBLE_MEMBER(A; private; file)!>A<!>()
val z = <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>x<!>
<!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>x<!> = 30
val z = <!INVISIBLE_MEMBER(x; private; file)!>x<!>
<!INVISIBLE_MEMBER(x; private; file)!>x<!> = 30
val po = <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>PO<!>
val po = <!INVISIBLE_MEMBER(PO; private; file)!>PO<!>
}
class B : <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE, ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>A<!>() {}
class B : <!INVISIBLE_REFERENCE(A; private; file), INVISIBLE_MEMBER(A; private; file)!>A<!>() {}
class Q {
class W {
@@ -44,4 +44,4 @@ class Q {
val y = makeA() //assure that 'makeA' is visible
}
}
}
}
compiler/testData/diagnostics/tests/scopes/visibility3.txt
Vendored
+4 -4
View File
@@ -17,10 +17,10 @@ package a {
public final class B : a.A {
public constructor B()
public final override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
invisible_fake final override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
invisible_fake open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
invisible_fake open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
invisible_fake open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
private object PO {