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

Fix tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-06 18:59:37 +03:00
parent 552211b2f4
commit 2ce9903356
84 changed files with 221 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt
Vendored
+3 -3
View File
@@ -8,9 +8,9 @@ target(AnnotationTarget.FUNCTION)
annotation class base
class My(x: Int) {
<!WRONG_ANNOTATION_TARGET!>smartget<!> var y = x
<!WRONG_ANNOTATION_TARGET!>@base<!> @smartget <!WRONG_ANNOTATION_TARGET!>@smartset<!> get
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@smartget<!> @smartset set
smartget var y = x
<!WRONG_ANNOTATION_TARGET!>@base<!> @smartget <!WRONG_ANNOTATION_TARGET!>@smartset<!> get
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@smartget<!> @smartset set
base <!WRONG_ANNOTATION_TARGET!>smartget<!> <!WRONG_ANNOTATION_TARGET!>smartset<!> fun foo() = y
}
compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal final class My {
public constructor My(/*0*/ x: kotlin.Int)
smartget() internal final var y: kotlin.Int
internal final var y: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
base() smartget() smartset() internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) k
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int)
base() internal final val x: kotlin.Int
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/annotations/options/targets/classifier.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int, /*1*/ base() w: @[base()] kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int, /*1*/ base() w: @[base()] kotlin.Int)
base() internal final val x: kotlin.Int
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/annotations/options/targets/constructor.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int)
base() internal final val x: kotlin.Int
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/annotations/options/targets/empty.txt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ empty() internal final enum class My : kotlin.Enum<My> {
empty() internal final class correct {
empty() public constructor correct()
public constructor correct(/*0*/ empty() x: kotlin.Int, /*1*/ empty() w: @[empty()] kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int, /*1*/ empty() w: @[empty()] kotlin.Int)
empty() internal final val x: kotlin.Int
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/annotations/options/targets/file.kt
Vendored
+3 -3
View File
@@ -8,7 +8,7 @@ annotation class common
// FILE: other.kt
@file:special
@file:special
package test
@@ -16,8 +16,8 @@ package test
// FILE: another.kt
<!WRONG_ANNOTATION_TARGET!>@file:common<!>
<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file:common<!>
package test
common class Correct
common class Correct
compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.an
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int)
base() internal final val x: kotlin.Int
base() public final fun baz(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ incorrect() internal final enum class My : kotlin.Enum<My> {
incorrect() internal final class correct {
incorrect() public constructor correct()
public constructor correct(/*0*/ incorrect() x: kotlin.Int, /*1*/ incorrect() w: @[incorrect()] kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int, /*1*/ incorrect() w: @[incorrect()] kotlin.Int)
incorrect() internal final val x: kotlin.Int
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/annotations/options/targets/java.kt
Vendored
+9 -9
View File
@@ -21,7 +21,7 @@ public class AnnotationTargets {
}
@Target(ElementType.FIELD)
public @interface field {
public @interface fieldann {
}
@@ -62,18 +62,18 @@ import test.AnnotationTargets.*
base meta type <!WRONG_ANNOTATION_TARGET!>konstructor<!> annotation class KMeta
base <!WRONG_ANNOTATION_TARGET!>meta<!> type <!WRONG_ANNOTATION_TARGET!>method<!> <!WRONG_ANNOTATION_TARGET!>multiple<!> class KClass(
@base @field <!WRONG_ANNOTATION_TARGET!>@parameter<!> val y:
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@type<!> Int) {
@base @fieldann @parameter val y:
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@type<!> Int) {
base multiple fieldann <!WRONG_ANNOTATION_TARGET!>local<!> val x = 0
@method <!WRONG_ANNOTATION_TARGET!>@konstructor<!> <!WRONG_ANNOTATION_TARGET!>@type<!> get
base multiple field <!WRONG_ANNOTATION_TARGET!>local<!> val x = 0
@method <!WRONG_ANNOTATION_TARGET!>@konstructor<!> <!WRONG_ANNOTATION_TARGET!>@type<!> get
base method multiple <!WRONG_ANNOTATION_TARGET!>konstructor<!>
fun foo(@parameter <!WRONG_ANNOTATION_TARGET!>@type<!> i:
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> Int
): <!WRONG_ANNOTATION_TARGET!>@field<!> <!WRONG_ANNOTATION_TARGET!>@parameter<!> Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> Int
): <!WRONG_ANNOTATION_TARGET!>@fieldann<!> <!WRONG_ANNOTATION_TARGET!>@parameter<!> Int {
@local @base <!WRONG_ANNOTATION_TARGET!>@multiple<!> <!WRONG_ANNOTATION_TARGET!>@field<!> val j = i + 1
@local @base <!WRONG_ANNOTATION_TARGET!>@multiple<!> <!WRONG_ANNOTATION_TARGET!>@fieldann<!> val j = i + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> return j
}
compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
Vendored
+6 -6
View File
@@ -15,8 +15,8 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) public final class field : kotlin.Annotation {
public constructor field()
kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) public final class fieldann : kotlin.Annotation {
public constructor fieldann()
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
@@ -74,11 +74,11 @@ package test {
test.AnnotationTargets.base() test.AnnotationTargets.meta() test.AnnotationTargets.type() test.AnnotationTargets.method() test.AnnotationTargets.multiple() internal final class KClass {
test.AnnotationTargets.base() test.AnnotationTargets.method() test.AnnotationTargets.konstructor() public constructor KClass()
public constructor KClass(/*0*/ test.AnnotationTargets.base() test.AnnotationTargets.field() test.AnnotationTargets.parameter() y: @[test.AnnotationTargets.base() test.AnnotationTargets.type()] kotlin.Int)
test.AnnotationTargets.base() test.AnnotationTargets.multiple() test.AnnotationTargets.field() test.AnnotationTargets.local() internal final val x: kotlin.Int = 0
test.AnnotationTargets.base() test.AnnotationTargets.field() test.AnnotationTargets.parameter() internal final val y: @[test.AnnotationTargets.base() test.AnnotationTargets.type()] kotlin.Int
public constructor KClass(/*0*/ test.AnnotationTargets.base() test.AnnotationTargets.parameter() y: @[test.AnnotationTargets.base() test.AnnotationTargets.type()] kotlin.Int)
test.AnnotationTargets.base() test.AnnotationTargets.multiple() test.AnnotationTargets.fieldann() test.AnnotationTargets.local() internal final val x: kotlin.Int = 0
test.AnnotationTargets.fieldann() internal final val y: @[test.AnnotationTargets.base() test.AnnotationTargets.type()] kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
test.AnnotationTargets.base() test.AnnotationTargets.method() test.AnnotationTargets.multiple() test.AnnotationTargets.konstructor() internal final fun foo(/*0*/ test.AnnotationTargets.parameter() test.AnnotationTargets.type() i: @[test.AnnotationTargets.base() test.AnnotationTargets.multiple()] kotlin.Int): @[test.AnnotationTargets.field() test.AnnotationTargets.parameter()] kotlin.Int
test.AnnotationTargets.base() test.AnnotationTargets.method() test.AnnotationTargets.multiple() test.AnnotationTargets.konstructor() internal final fun foo(/*0*/ test.AnnotationTargets.parameter() test.AnnotationTargets.type() i: @[test.AnnotationTargets.base() test.AnnotationTargets.multiple()] kotlin.Int): @[test.AnnotationTargets.fieldann() test.AnnotationTargets.parameter()] kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kot
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int)
base() internal final val x: kotlin.Int
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/annotations/options/targets/property.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.an
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int, /*1*/ base() w: kotlin.Int)
public constructor correct(/*0*/ x: kotlin.Int, /*1*/ base() w: kotlin.Int)
base() internal final val x: kotlin.Int
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/annotations/options/targets/type.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annota
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: @[base()] kotlin.Int)
public constructor correct(/*0*/ x: @[base()] kotlin.Int)
base() internal final val x: @[base()] kotlin.Int
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/annotations/options/targets/valueparam.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ target(AnnotationTarget.VALUE_PARAMETER) annotation class base
<!WRONG_ANNOTATION_TARGET!>base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>base<!> class correct(<!WRONG_ANNOTATION_TARGET!>base<!> val x: Int, base w: Int) {
<!WRONG_ANNOTATION_TARGET!>base<!> class correct(base val x: Int, base w: Int) {
<!WRONG_ANNOTATION_TARGET!>base<!> constructor(): this(0, 0)
}
compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) ko
base() internal final class correct {
base() public constructor correct()
public constructor correct(/*0*/ base() x: kotlin.Int, /*1*/ base() w: kotlin.Int)
base() internal final val x: kotlin.Int
internal final val x: kotlin.Int
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