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/duplicateJvmSignature/erasure/collections.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
internal fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
internal fun foo(/*0*/ s: kotlin.MutableList<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.MutableList<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
Vendored
+7 -7
View File
@@ -1,24 +1,24 @@
package
internal interface Bar</*0*/ T> {
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz(/*0*/ f: Foo<kotlin.String>, /*1*/ b: Bar<kotlin.Int>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface Foo</*0*/ T> {
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
Vendored
+5 -5
View File
@@ -1,17 +1,17 @@
package
internal final class Bar : Foo<kotlin.String> {
public final class Bar : Foo<kotlin.String> {
public constructor Bar(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface Foo</*0*/ T> {
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
Vendored
+7 -7
View File
@@ -1,25 +1,25 @@
package
internal final class Bar : Foo<kotlin.String> {
public final class Bar : Foo<kotlin.String> {
public constructor Bar(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class BarOther : Foo<kotlin.String> {
public final class BarOther : Foo<kotlin.String> {
public constructor BarOther(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface Foo</*0*/ T> {
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
package
internal val </*0*/ T> G<T>.foo: kotlin.Int
internal val G<kotlin.String>.foo: kotlin.Int
public val </*0*/ T> G<T>.foo: kotlin.Int
public val G<kotlin.String>.foo: kotlin.Int
internal final class G</*0*/ T> {
public final class G</*0*/ T> {
public constructor G</*0*/ T>()
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/duplicateJvmSignature/erasure/genericType.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
package
internal fun foo(/*0*/ x: G<kotlin.Int>): G<kotlin.String>
internal fun foo(/*0*/ x: G<kotlin.String>): G<kotlin.Int>
public fun foo(/*0*/ x: G<kotlin.Int>): G<kotlin.String>
public fun foo(/*0*/ x: G<kotlin.String>): G<kotlin.Int>
internal final class G</*0*/ T> {
public final class G</*0*/ T> {
public constructor G</*0*/ T>()
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/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
Vendored
+7 -7
View File
@@ -1,24 +1,24 @@
package
internal interface Bar</*0*/ T> {
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface Foo</*0*/ T> {
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
internal fun foo(/*0*/ s: java.util.List<kotlin.String>): kotlin.Unit
internal fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: java.util.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
internal fun foo(/*0*/ x: kotlin.String): kotlin.Unit
internal fun foo(/*0*/ x: kotlin.String?): kotlin.Unit
public fun foo(/*0*/ x: kotlin.String): kotlin.Unit
public fun foo(/*0*/ x: kotlin.String?): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
Vendored
+9 -9
View File
@@ -1,32 +1,32 @@
package
internal interface A</*0*/ T> {
public interface A</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class C : A<kotlin.String>, B {
public final class C : A<kotlin.String>, B {
public constructor C(/*0*/ f: A<kotlin.String>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class D : A<kotlin.Int>, B {
public final class D : A<kotlin.Int>, B {
public constructor D(/*0*/ f: A<kotlin.Int>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
Vendored
+8 -8
View File
@@ -1,25 +1,25 @@
package
internal interface Bar</*0*/ T> {
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
internal final fun foo(/*0*/ l: kotlin.List<kotlin.Long>): kotlin.Unit
internal open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.List<kotlin.Long>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface Foo</*0*/ T> {
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
internal fun foo(/*0*/ s: java.lang.String): kotlin.Unit
internal fun foo(/*0*/ s: kotlin.String): kotlin.Unit
public fun foo(/*0*/ s: java.lang.String): kotlin.Unit
public fun foo(/*0*/ s: kotlin.String): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
internal fun </*0*/ T> foo(/*0*/ x: T): T
internal fun foo(/*0*/ x: kotlin.Any): kotlin.Any
public fun </*0*/ T> foo(/*0*/ x: T): T
public fun foo(/*0*/ x: kotlin.Any): kotlin.Any
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
package
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T
public fun foo(/*0*/ x: Foo): Foo
public fun </*0*/ T : Foo> foo(/*0*/ x: T): T
internal interface Foo {
public interface Foo {
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/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.txt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
package
internal fun foo(/*0*/ x: Bar): Bar
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
public fun foo(/*0*/ x: Bar): Bar
public fun foo(/*0*/ x: Foo): Foo
public fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
internal interface Bar {
public interface Bar {
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 Foo {
public interface Foo {
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/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.txt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
package
internal fun foo(/*0*/ x: Bar): Bar
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
public fun foo(/*0*/ x: Bar): Bar
public fun foo(/*0*/ x: Foo): Foo
public fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
internal interface Bar {
public interface Bar {
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 Foo {
public interface Foo {
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