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

fix tests in org.jetbrains.kotlin.checkers

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-03 15:25:57 +03:00
parent a3f22939f1
commit bc5c9065d2
2821 changed files with 12932 additions and 12960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A<kotlin.Int>): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
Vendored
+2 -2
View File
@@ -28,7 +28,7 @@ package p {
public final class A {
public constructor A()
internal final val x: kotlin.Int = 1
public final val x: kotlin.Int = 1
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
@@ -39,7 +39,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
Vendored
+1 -1
View File
@@ -148,7 +148,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(/*0*/ m1: p.M1): kotlin.Unit
public fun test(/*0*/ m1: p.M1): kotlin.Unit
package p {
public fun a(/*0*/ p: p.A): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: [ERROR : A]<kotlin.Int>): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
Vendored
+1 -1
View File
@@ -69,7 +69,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun a(/*0*/ a: p.A): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt
Vendored
+9 -9
View File
@@ -24,20 +24,20 @@ package p {
package
package p {
internal fun test(): kotlin.Unit
internal final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public fun test(): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
public constructor A()
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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class B {
// -- Module: <m1> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt
Vendored
+9 -9
View File
@@ -24,20 +24,20 @@ package p {
package
package p {
internal fun test(): kotlin.Unit
internal final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public fun test(): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
public constructor A()
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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class B {
// -- Module: <m1> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(/*0*/ a: p.A): kotlin.Unit
public fun test(/*0*/ a: p.A): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
Vendored
+2 -2
View File
@@ -23,9 +23,9 @@ package p {
// -- Module: <m2> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
internal final class A {
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ package p {
// -- Module: <m3> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A<kotlin.Int>): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
Vendored
+1 -1
View File
@@ -53,7 +53,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
public fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
public fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
public fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
public fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
Vendored
+1 -1
View File
@@ -90,7 +90,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ package p {
// -- Module: <m4> --
package
internal fun p.B.test(): kotlin.Unit
public fun p.B.test(): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
Vendored
+2 -2
View File
@@ -47,8 +47,8 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
internal fun test1(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
Vendored
+1 -1
View File
@@ -53,7 +53,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
Vendored
+4 -4
View File
@@ -47,10 +47,10 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
internal fun test1(/*0*/ b: p.B?): kotlin.Unit
internal fun test2(/*0*/ b: p.B?): kotlin.Unit
internal fun test3(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
public fun test2(/*0*/ b: p.B?): kotlin.Unit
public fun test3(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
Vendored
+2 -2
View File
@@ -47,8 +47,8 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
internal fun test1(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
Vendored
+2 -2
View File
@@ -63,8 +63,8 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
internal fun test1(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
Vendored
+2 -2
View File
@@ -47,8 +47,8 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
internal fun test1(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
Vendored
+1 -1
View File
@@ -90,7 +90,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B, kotlin.String>): kotlin.Unit
public fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B, kotlin.String>): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
Vendored
+1 -1
View File
@@ -54,7 +54,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ package p {
// -- Module: <m4> --
package
internal fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
Vendored
+1 -1
View File
@@ -50,7 +50,7 @@ package p {
// -- Module: <m3> --
package
internal final class Foo : p.C, p.B {
public final class Foo : p.C, p.B {
public constructor Foo()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ package p {
// -- Module: <m3> --
package
internal final class Foo : p.A, p.B {
public final class Foo : p.A, p.B {
public constructor Foo()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ package p {
// -- Module: <m3> --
package
internal final class Foo : p.A, p.B {
public final class Foo : p.A, p.B {
public constructor Foo()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun </*0*/ T> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ package p {
// -- Module: <m3> --
package
internal final class Foo : p.A<kotlin.String>, p.B {
public final class Foo : p.A<kotlin.String>, p.B {
public constructor Foo()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
compiler/testData/diagnostics/tests/multimodule/internal.txt
Vendored
+13 -13
View File
@@ -2,20 +2,20 @@
package
package p {
internal val a: p.A
internal var v: p.A
internal fun a(): p.A
public val a: p.A
public var v: p.A
public fun a(): p.A
public final class A {
public constructor A()
internal final val a: p.A
internal final var v: p.A
internal final fun a(): p.A
public final val a: p.A
public final var v: p.A
public final fun a(): p.A
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 final inner class B {
public final inner class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,7 +23,7 @@ package p {
}
}
internal final class B {
public final class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,18 +35,18 @@ package p {
// -- Module: <m2> --
package
internal fun test(): kotlin.Unit
public fun test(): kotlin.Unit
package p {
internal val a: p.A
internal var v: p.A
internal fun a(): p.A
public val a: p.A
public var v: p.A
public fun a(): p.A
public final class A {
// -- Module: <m1> --
}
internal final class B {
public final class B {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/packagePrivate.txt
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ package
package p {
private val a: kotlin.Int = 1
internal val b: kotlin.Int = 1
public val b: kotlin.Int = 1
}
@@ -12,6 +12,6 @@ package
package p {
private val a: kotlin.Int = 1
internal val b: kotlin.Int = 1
internal val c: kotlin.Int = 1
public val b: kotlin.Int = 1
public val c: kotlin.Int = 1
}
compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
Vendored
+1 -3
View File
@@ -20,7 +20,7 @@ package p {
package
package m {
internal fun main(): kotlin.Unit
public fun main(): kotlin.Unit
}
package p {
@@ -29,5 +29,3 @@ package p {
public fun foo(/*0*/ vararg values: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
public fun foo(/*0*/ vararg values: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
}