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

fix tests in org.jetbrains.kotlin.checkers (related to KT-9072)

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-07 20:36:59 +03:00
parent 7c1758a8d3
commit aa44606663
27 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/ObjectWithConstructor.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val x: kotlin.Any
public val x: x.<no name provided>
public object A1 {
private constructor A1()
compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val a: T
public val a: a.<no name provided>
kotlin.annotation.annotation() public final class Ann : C {
public constructor Ann()
compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ package kt462 {
public final class T {
public constructor T()
public final val a: kotlin.Any
public final val a: kt462.T.a.<no name provided>
public final var r: kotlin.Int
public final var x: kotlin.Int
public final val z: kotlin.Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val m: X
public val m: m.<no name provided>
public interface X {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
package kt1191 {
public fun foo(/*0*/ unused: kotlin.Int): kotlin.Any
public fun foo(/*0*/ unused: kotlin.Int): kt1191.foo.<no name provided>
public fun </*0*/ T> kt1191.FunctionalList<T>.plus(/*0*/ element: T): kt1191.FunctionalList<T>
public interface FunctionalList</*0*/ T> {
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
package b {
public var f: () -> kotlin.Unit
public val g: () -> kotlin.Int
public val o: kotlin.Any
public val o: b.o.<no name provided>
public val p: b.P
public fun doSmth(/*0*/ i: kotlin.Int): kotlin.Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val m: X
public val m: m.<no name provided>
public fun box(): kotlin.Unit
public interface X {
compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
Vendored
+18 -18
View File
@@ -16,13 +16,13 @@ class Foo {
privateProperty.f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}
protected val protectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}
val internalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}
public val publicProperty = object : MyClass(), MyTrait {}
private fun privateFunction() = object : MyClass(), MyTrait {}
@@ -32,13 +32,13 @@ class Foo {
privateFunction().f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected fun protectedFunction()<!> = object : MyClass(), MyTrait {}
protected fun protectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun internalFunction()<!> = object : MyClass(), MyTrait {}
fun internalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun internal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun publicFunction()<!> = object : MyClass(), MyTrait {}
public fun publicFunction() = object : MyClass(), MyTrait {}
@@ -50,13 +50,13 @@ class Foo {
privatePropertyInner.f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}
protected val protectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}
val internalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}
public val publicProperty = object : MyClass(), MyTrait {}
private fun privateFunctionInner() = object : MyClass(), MyTrait {}
@@ -66,13 +66,13 @@ class Foo {
privateFunctionInner().f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected fun protectedFunction()<!> = object : MyClass(), MyTrait {}
protected fun protectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun internalFunction()<!> = object : MyClass(), MyTrait {}
fun internalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun internal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun publicFunction()<!> = object : MyClass(), MyTrait {}
public fun publicFunction() = object : MyClass(), MyTrait {}
}
@@ -90,21 +90,21 @@ class Foo {
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>private val packagePrivateProperty<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> val packageProtectedProperty<!> = object : MyClass(), MyTrait {}
<!WRONG_MODIFIER_TARGET!>protected<!> val packageProtectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val packageInternalProperty<!> = object : MyClass(), MyTrait {}
val packageInternalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val packageInternal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val packagePublicProperty<!> = object : MyClass(), MyTrait {}
public val packagePublicProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> fun packageProtectedFunction()<!> = object : MyClass(), MyTrait {}
<!WRONG_MODIFIER_TARGET!>protected<!> fun packageProtectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun packageInternalFunction()<!> = object : MyClass(), MyTrait {}
fun packageInternalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun packageInternal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun packagePublicFunction()<!> = object : MyClass(), MyTrait {}
public fun packagePublicFunction() = object : MyClass(), MyTrait {}
fun fooPackage() {
val packageLocalVar = object : MyClass(), MyTrait {}
compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.txt
Vendored
+18 -24
View File
@@ -1,62 +1,56 @@
package
internal val packageInternal2Property: MyClass
public val packageInternalProperty: MyClass
internal val packageInternalProperty: MyClass
private val packagePrivateProperty: MyClass
protected val packageProtectedProperty: MyClass
protected val packageProtectedProperty: packageProtectedProperty.<no name provided>
public val packagePublic2Property: MyClass
public val packagePublicProperty: MyClass
public val packagePublicProperty: packagePublicProperty.<no name provided>
public fun fooPackage(): kotlin.Unit
internal fun internal2Function(): MyClass
public fun internalFunction(): MyClass
internal fun internalFunction(): MyClass
private fun privateFunction(): MyClass
protected fun protectedFunction(): MyClass
protected fun protectedFunction(): protectedFunction.<no name provided>
public fun public2Function(): MyClass
public fun publicFunction(): MyClass
public fun publicFunction(): publicFunction.<no name provided>
public fun testFunctions(): kotlin.Unit
public fun testProperties(): kotlin.Unit
public final class Foo {
public constructor Foo()
internal final val internal2Property: MyClass
public final val internalProperty: MyClass
internal final val internalProperty: MyClass
private final val privateProperty: Foo.privateProperty.<no name provided>
protected final val protected2Property: MyClass
protected final val protectedProperty: MyClass
protected final val protectedProperty: Foo.protectedProperty.<no name provided>
public final val public2Property: MyClass
public final val publicProperty: MyClass
public final val publicProperty: Foo.publicProperty.<no name provided>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal final fun internal2Function(): MyClass
public final fun internalFunction(): MyClass
internal final fun internalFunction(): MyClass
private final fun privateFunction(): Foo.privateFunction.<no name provided>
protected final fun protected2Function(): MyClass
protected final fun protectedFunction(): MyClass
protected final fun protectedFunction(): Foo.protectedFunction.<no name provided>
public final fun public2Function(): MyClass
public final fun publicFunction(): MyClass
public final fun publicFunction(): Foo.publicFunction.<no name provided>
public final fun testFunctions(): kotlin.Unit
public final fun testProperties(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class FooInner {
public constructor FooInner()
internal final val internal2Property: MyClass
public final val internalProperty: MyClass
internal final val internalProperty: MyClass
private final val privateProperty: Foo.FooInner.privateProperty.<no name provided>
protected final val protected2Property: MyClass
protected final val protectedProperty: MyClass
protected final val protectedProperty: Foo.FooInner.protectedProperty.<no name provided>
public final val public2Property: MyClass
public final val publicProperty: MyClass
public final val publicProperty: Foo.FooInner.publicProperty.<no name provided>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal final fun internal2Function(): MyClass
public final fun internalFunction(): MyClass
internal final fun internalFunction(): MyClass
private final fun privateFunction(): Foo.FooInner.privateFunction.<no name provided>
protected final fun protected2Function(): MyClass
protected final fun protectedFunction(): MyClass
protected final fun protectedFunction(): Foo.FooInner.protectedFunction.<no name provided>
public final fun public2Function(): MyClass
public final fun publicFunction(): MyClass
public final fun publicFunction(): Foo.FooInner.publicFunction.<no name provided>
public final fun testFunctions(): kotlin.Unit
public final fun testProperties(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package
public fun foo(): kotlin.Any
public fun foo(): foo.<no name provided>
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
public final class Outer {
public constructor Outer()
public final val x: kotlin.Any
public final val x: Outer.x.<no name provided>
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
compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public fun </*0*/ T : kotlin.Any> T?.iterator(): MyIterator<T>
public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
public fun </*0*/ T : kotlin.Any> T?.iterator(): iterator.<no name provided>
public fun </*0*/ T> java.util.Enumeration<T>.iterator(): iterator.<no name provided>
public interface MyIterator</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/extensions/GenericIterator2.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
package
public fun a(/*0*/ e: java.util.Enumeration<kotlin.Int>): kotlin.Unit
public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
public fun </*0*/ T> java.util.Enumeration<T>.iterator(): iterator.<no name provided>
compiler/testData/diagnostics/tests/inference/constraints/kt8879.txt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
package
internal fun </*0*/ X> bar(): Inv<X>
internal fun </*0*/ T : Inv2<T>> foo(/*0*/ klass: Inv<T>): kotlin.String?
internal fun test(): kotlin.Unit
public fun </*0*/ X> bar(): Inv<X>
public fun </*0*/ T : Inv2<T>> foo(/*0*/ klass: Inv<T>): kotlin.String?
public fun test(): kotlin.Unit
internal interface Inv</*0*/ I> {
public interface Inv</*0*/ I> {
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
}
internal interface Inv2</*0*/ I> {
public interface Inv2</*0*/ I> {
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
compiler/testData/diagnostics/tests/inner/illegalModifier.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val R: kotlin.Any
public val R: R.<no name provided>
public val prop: kotlin.Int = 42
public fun foo(): kotlin.Unit
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ public final class Test {
public companion object Companion : Test.InnerClass {
private constructor Companion()
public final val a: Test.InnerClass
public final val a: Test.Companion.a.<no name provided>
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 final fun more(): Test.InnerClass
compiler/testData/diagnostics/tests/inner/innerErrorForObjects.txt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ public final class Test {
public object Some : Test.InnerClass {
private constructor Some()
public final val a: Test.InnerClass
public final val a: Test.Some.a.<no name provided>
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 final fun more(): Test.InnerClass
compiler/testData/diagnostics/tests/inner/kt6026.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package
public val oo: kotlin.Any
public val oo: oo.<no name provided>
compiler/testData/diagnostics/tests/objects/Objects.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
package toplevelObjectDeclarations {
public val x: kotlin.Int
public val y: toplevelObjectDeclarations.Foo
public val y: toplevelObjectDeclarations.y.<no name provided>
public val z: kotlin.Int
public object A : toplevelObjectDeclarations.Foo {
compiler/testData/diagnostics/tests/objects/kt2240.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
package a {
public val o: kotlin.Any
public val o: a.o.<no name provided>
public fun </*0*/ T> a.A.foo(/*0*/ f: T): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val anonObject: kotlin.Any
public val anonObject: anonObject.<no name provided>
public object A {
private constructor A()
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ kotlin.js.native() public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ kotlin.js.native() public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ kotlin.js.native() public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class A {
public final class B {
public constructor B()
public final val anonymous: kotlin.Any
public final val anonymous: A.B.anonymous.<no name provided>
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