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

Remove leftovers of platformName and platformStatic in test data

Browse Source 
Drop unnecessary imports, rename some tests
This commit is contained in:
Alexander Udalov
2016-03-02 16:47:04 +03:00
parent beb11e7ac1
commit 8e77e16bbd
55 changed files with 168 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
class A {
companion object {
<!JVM_STATIC_ON_CONST_OR_JVM_FIELD!>@JvmStatic const val z<!> = 1;
<!JVM_STATIC_ON_CONST_OR_JVM_FIELD!>@JvmStatic @JvmField val x<!> = 1;
}
}
object B {
<!JVM_STATIC_ON_CONST_OR_JVM_FIELD!>@JvmStatic const val z<!> = 1;
<!JVM_STATIC_ON_CONST_OR_JVM_FIELD!>@JvmStatic @JvmField val x<!> = 1;
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
package
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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic() @kotlin.jvm.JvmField() public final val x: kotlin.Int = 1
@kotlin.jvm.JvmStatic() public const final val z: 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
}
}
public object B {
private constructor B()
@kotlin.jvm.JvmStatic() @kotlin.jvm.JvmField() public final val x: kotlin.Int = 1
@kotlin.jvm.JvmStatic() public const final val z: 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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
class A(<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic val z: Int<!>) {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package
public final class A {
public constructor A(/*0*/ z: kotlin.Int)
@kotlin.jvm.JvmStatic() public final val z: 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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
class A {
<!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor() {}
inner class B {
<!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor() {}
}
}
class C <!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor()
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
Vendored
+22
View File
@@ -0,0 +1,22 @@
package
public final class A {
@kotlin.jvm.JvmStatic() 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class B {
@kotlin.jvm.JvmStatic() 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class C {
@kotlin.jvm.JvmStatic() public constructor C()
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/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
abstract class A {
open fun a() {}
abstract fun b()
open fun c() {}
}
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic final override fun c()<!> {}
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun d() {}
}
class C {
companion object: A() {
@JvmStatic override fun a() {}
@JvmStatic override fun b() {}
@JvmStatic final override fun c() {}
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun d() {}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
package
public abstract class A {
public constructor A()
public open fun a(): kotlin.Unit
public abstract fun b(): kotlin.Unit
public open fun c(): 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
}
public object B : A {
private constructor B()
@kotlin.jvm.JvmStatic() public open override /*1*/ fun a(): kotlin.Unit
@kotlin.jvm.JvmStatic() public open override /*1*/ fun b(): kotlin.Unit
@kotlin.jvm.JvmStatic() public final override /*1*/ fun c(): kotlin.Unit
@kotlin.jvm.JvmStatic() public open fun d(): 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
}
public final class C {
public constructor C()
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
public companion object Companion : A {
private constructor Companion()
@kotlin.jvm.JvmStatic() public open override /*1*/ fun a(): kotlin.Unit
@kotlin.jvm.JvmStatic() public open override /*1*/ fun b(): kotlin.Unit
@kotlin.jvm.JvmStatic() public final override /*1*/ fun c(): kotlin.Unit
@kotlin.jvm.JvmStatic() public open fun d(): 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
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt
Vendored
+52
View File
@@ -0,0 +1,52 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
class A {
companion object {
@JvmStatic fun a1() {
}
}
object A {
@JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
}
}
interface B {
companion object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a1()<!> {
}
}
object A {
@JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
Vendored
+50
View File
@@ -0,0 +1,50 @@
package
public final class A {
public constructor A()
@kotlin.jvm.JvmStatic() public final fun a4(): 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 final fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public object A {
private constructor A()
@kotlin.jvm.JvmStatic() public final fun a2(): 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
}
public companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic() public final fun a1(): 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
}
}
public interface B {
@kotlin.jvm.JvmStatic() public open fun a4(): 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 fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public object A {
private constructor A()
@kotlin.jvm.JvmStatic() public final fun a2(): 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
}
public companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic() public final fun a1(): 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
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
fun main(args: Array<String>) {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a()<!>{
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt
Vendored
+44
View File
@@ -0,0 +1,44 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
open class B {
public open val base1 : Int = 1
public open val base2 : Int = 1
}
class A {
companion object : B() {
var p1:Int = 1
@JvmStatic set(p: Int) {
p1 = 1
}
@JvmStatic val z = 1;
@JvmStatic override val base1: Int = 0
override val base2: Int = 0
@JvmStatic get
}
object A : B() {
var p:Int = 1
@JvmStatic set(p1: Int) {
p = 1
}
@JvmStatic val z = 1;
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override val base1: Int<!> = 0
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun f() {}
override val base2: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic get<!>
}
var p:Int = 1
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic set(p1: Int)<!> {
p = 1
}
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic val z2<!> = 1;
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
Vendored
+42
View File
@@ -0,0 +1,42 @@
package
public final class A {
public constructor A()
public final var p: kotlin.Int
@kotlin.jvm.JvmStatic() public final val z2: 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
public object A : B {
private constructor A()
@kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p: kotlin.Int
@kotlin.jvm.JvmStatic() public final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic() public open fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public companion object Companion : B {
private constructor Companion()
@kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p1: kotlin.Int
@kotlin.jvm.JvmStatic() public final val z: 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
}
}
public open class B {
public constructor B()
public open val base1: kotlin.Int = 1
public open val base2: 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
}