Minor: fix testdata

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
@@ -9,11 +9,11 @@ private val a = 1
package p
val b = <!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>a<!> // same package, same module
val b = <!INVISIBLE_MEMBER(a; private; file)!>a<!> // same package, same module
// MODULE: m2(m1)
// FILE: c.kt
package p
val c = <!INVISIBLE_MEMBER!>a<!> // same package, another module
val c = <!INVISIBLE_MEMBER(a; private; file)!>a<!> // same package, another module
@@ -29,21 +29,21 @@ 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<!>
val v = xx
<!ACCESS_TO_PRIVATE_TOP_LEVEL_FROM_ANOTHER_FILE!>xx<!> = 40
<!INVISIBLE_SETTER(xx; private; file)!>xx<!> = 40
}
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 {
@@ -51,4 +51,4 @@ class Q {
val y = makeA() //assure that 'makeA' is visible
}
}
}
}
@@ -18,10 +18,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 {
+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<!>()
}
+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"
}
}
+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
}
}
}
}
+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 {
@@ -17,23 +17,23 @@ class Test<in I> {
apply(this.foo())
with(Test<I>()) {
apply(foo()) // resolved to this@Test.foo
apply(this.<!INVISIBLE_MEMBER(foo; private/*private to this*/; Test)!>foo<!>())
apply(this@with.<!INVISIBLE_MEMBER(foo; private/*private to this*/; Test)!>foo<!>())
apply(this.<!INVISIBLE_MEMBER(foo; private/*private to this*/; 'Test')!>foo<!>())
apply(this@with.<!INVISIBLE_MEMBER(foo; private/*private to this*/; 'Test')!>foo<!>())
apply(this@Test.foo())
}
}
fun <I> test(t: Test<I>) {
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; Test)!>foo<!>())
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; 'Test')!>foo<!>())
}
companion object {
fun <I> test(t: Test<I>) {
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; Test)!>foo<!>())
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; 'Test')!>foo<!>())
}
}
}
fun <I> test(t: Test<I>) {
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; Test)!>foo<!>())
}
t.apply(t.<!INVISIBLE_MEMBER(foo; private/*private to this*/; 'Test')!>foo<!>())
}
@@ -16,23 +16,23 @@ class Test<in I, out O> {
apply(this.i)
with(Test<I, O>()) {
apply(i) // resolved to this@Test.i
apply(this.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!>)
apply(this@with.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!>)
apply(this.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!>)
apply(this@with.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!>)
apply(this@Test.i)
}
}
fun <I, O> test(t: Test<I, O>) {
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!>)
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!>)
}
companion object {
fun <I, O> test(t: Test<I, O>) {
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!>)
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!>)
}
}
}
fun <I, O> test(t: Test<I, O>) {
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!>)
}
t.apply(t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!>)
}
@@ -16,23 +16,23 @@ class Test<in I, out O> {
this.i = getT()
with(Test<I, O>()) {
i = getT() // resolved to this@Test.i
this.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!> = getT()
this@with.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!> = getT()
this.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!> = getT()
this@with.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!> = getT()
this@Test.i = getT()
}
}
fun <I, O> test(t: Test<I, O>) {
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!> = getT()
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!> = getT()
}
companion object {
fun <I, O> test(t: Test<I, O>) {
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!> = getT()
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!> = getT()
}
}
}
fun <I, O> test(t: Test<I, O>) {
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; Test)!>i<!> = getT()
}
t.<!INVISIBLE_MEMBER(i; private/*private to this*/; 'Test')!>i<!> = getT()
}
@@ -1,10 +1,10 @@
// ERROR: Cannot access 'd': it is 'private' in 'a'
// ERROR: Cannot access 'd': it is 'private' in 'a'
// ERROR: Cannot access 'b': it is 'private' in 'a'
// ERROR: Cannot access 'b': it is 'private' in 'a'
// ERROR: Cannot access 'd': it is 'private' in file
// ERROR: Cannot access 'd': it is 'private' in file
// ERROR: Cannot access 'b': it is 'private' in file
// ERROR: Cannot access 'b': it is 'private' in file
package to
import a.b
import a.d
fun f(c: IntRange) = d + b
fun f(c: IntRange) = d + b
@@ -10,7 +10,7 @@ public fun publicInM1Test() {
}
fun access() {
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in 'shared'">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
internalInM1()
publicInM1()
@@ -33,4 +33,4 @@ fun access() {
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: privateInM3Test">privateInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: internalInM3Test">internalInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: publicInM3Test">publicInM3Test</error>()
}
}
+2 -2
View File
@@ -10,7 +10,7 @@ public fun publicInM2() {
}
fun access() {
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in 'shared'">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
publicInM1()
@@ -33,4 +33,4 @@ fun access() {
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: privateInM3Test">privateInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: internalInM3Test">internalInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: publicInM3Test">publicInM3Test</error>()
}
}
@@ -10,15 +10,15 @@ public fun publicInM2Test() {
}
fun access() {
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in 'shared'">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
publicInM1()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in 'test'">privateInM1Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
publicInM1Test()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in 'shared'">privateInM2</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
internalInM2()
publicInM2()
@@ -33,4 +33,4 @@ fun access() {
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: privateInM3Test">privateInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: internalInM3Test">internalInM3Test</error>()
<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: publicInM3Test">publicInM3Test</error>()
}
}
@@ -10,27 +10,27 @@ public fun publicInM3Test() {
}
fun access() {
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in 'shared'">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
publicInM1()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in 'test'">privateInM1Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
publicInM1Test()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in 'shared'">privateInM2</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2': it is 'internal' in 'shared'">internalInM2</error>()
publicInM2()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is 'private' in 'test'">privateInM2Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is 'private' in file">privateInM2Test</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2Test': it is 'internal' in 'test'">internalInM2Test</error>()
publicInM2Test()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is 'private' in 'shared'">privateInM3</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is 'private' in file">privateInM3</error>()
internalInM3()
publicInM3()
privateInM3Test()
internalInM3Test()
publicInM3Test()
}
}
+3 -3
View File
@@ -7,13 +7,13 @@ fun testVisibility() {
<error descr="[INVISIBLE_MEMBER] Cannot access 'InternalClassInM1': it is 'internal' in 'm1'">InternalClassInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is 'private' in 'm1'">PrivateClassInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is 'private' in file">PrivateClassInM1</error>()
publicFunInM1()
<error descr="[INVISIBLE_MEMBER] Cannot access 'internalFunInM1': it is 'internal' in 'm1'">internalFunInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is 'private' in 'm1'">privateFunInM1</error>()
<error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is 'private' in file">privateFunInM1</error>()
}
public class ClassInM2
@@ -31,4 +31,4 @@ public class B: <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is '
<error descr="[INVISIBLE_MEMBER] Cannot access 'int': it is 'invisible_fake' in 'B'">int</error>()
}
}
}