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

Cleanup deprecated symbol usages in testData

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-16 20:10:40 +03:00
parent eefbd72a64
commit 25c4453dc5
403 changed files with 933 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
Vendored
+8 -8
View File
@@ -5,22 +5,22 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 2) return "fail1: ${value1.size()}"
val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
if (value1.size != 2) return "fail1: ${value1.size}"
if (value1[0] != "d1") return "fail2: ${value1[0]}"
if (value1[1] != "d2") return "fail3: ${value1[1]}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 2) return "fail4: ${value2.size()}"
val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
if (value2.size != 2) return "fail4: ${value2.size}"
if (value2[0] != "d1") return "fail5: ${value2[0]}"
if (value2[1] != "d2") return "fail6: ${value2[1]}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail7: ${value3.size()}"
val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
if (value3.size != 1) return "fail7: ${value3.size}"
if (value3[0] != "asd") return "fail8: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 9: ${value4.size()}"
val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
if (value4.size != 0) return "fail 9: ${value4.size}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
Vendored
+8 -8
View File
@@ -5,18 +5,18 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 0) return "fail1: ${value1.size()}"
val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
if (value1.size != 0) return "fail1: ${value1.size}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 0) return "fail2: ${value2.size()}"
val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
if (value2.size != 0) return "fail2: ${value2.size}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail3: ${value3.size()}"
val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
if (value3.size != 1) return "fail3: ${value3.size}"
if (value3[0] != "asd") return "fail4: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 5: ${value4.size()}"
val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
if (value4.size != 0) return "fail 5: ${value4.size}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@JavaAnn("value") class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value}"
return "OK"
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@
@JavaAnn2 class MyClass2
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value}"
val ann2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn2>())
val ann2 = MyClass2::class.java.getAnnotation(JavaAnn2::class.java)
if (ann2 == null) return "fail: cannot find Ann on MyClass}"
if (ann2.a != 1) return "fail for a: expected = 1, but was ${ann2.a}"
if (ann2.b != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b}"
compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b) class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
val ann = MyClass::class.java.getAnnotation(Ann::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.i != -2) return "fail: annotation parameter i should be -2, but was ${ann.i}"
if (ann.s != (-2).toShort()) return "fail: annotation parameter i should be -2, but was ${ann.i}"
compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.bool, Foo.c, Foo.str, Foo.charAsInt, Foo.intAsChar) class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
val ann = MyClass::class.java.getAnnotation(Ann::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.c) class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
val ann = MyClass::class.java.getAnnotation(Ann::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(args = arrayOf(O::class, K::class)) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class OK
@JavaAnn(OK::class) class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun box(): String {
val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(O::class, K::class) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ class O
class K
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt
Vendored
+8 -8
View File
@@ -5,22 +5,22 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 2) return "fail1: ${value1.size()}"
val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
if (value1.size != 2) return "fail1: ${value1.size}"
if (value1[0] != "d1") return "fail2: ${value1[0]}"
if (value1[1] != "d2") return "fail3: ${value1[1]}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 2) return "fail4: ${value2.size()}"
val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
if (value2.size != 2) return "fail4: ${value2.size}"
if (value2[0] != "d1") return "fail5: ${value2[0]}"
if (value2[1] != "d2") return "fail6: ${value2[1]}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail7: ${value3.size()}"
val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
if (value3.size != 1) return "fail7: ${value3.size}"
if (value3[0] != "asd") return "fail8: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 9: ${value4.size()}"
val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
if (value4.size != 0) return "fail 9: ${value4.size}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt
Vendored
+8 -8
View File
@@ -5,18 +5,18 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 0) return "fail1: ${value1.size()}"
val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
if (value1.size != 0) return "fail1: ${value1.size}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 0) return "fail2: ${value2.size()}"
val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
if (value2.size != 0) return "fail2: ${value2.size}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail3: ${value3.size()}"
val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
if (value3.size != 1) return "fail3: ${value3.size}"
if (value3[0] != "asd") return "fail4: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 5: ${value4.size()}"
val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
if (value4.size != 0) return "fail 5: ${value4.size}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@JavaAnn("value") class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value}"
return "OK"
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@
@JavaAnn2 class MyClass2
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value}"
val ann2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn2>())
val ann2 = MyClass2::class.java.getAnnotation(JavaAnn2::class.java)
if (ann2 == null) return "fail: cannot find Ann on MyClass}"
if (ann2.a != 1) return "fail for a: expected = 1, but was ${ann2.a}"
if (ann2.b != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b}"
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(args = arrayOf(O::class, K::class)) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class OK
@JavaAnn(OK::class) class MyClass
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun box(): String {
val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
val ann = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(O::class, K::class) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ class O
class K
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/enum/staticField.kt
Vendored
+2 -2
View File
@@ -4,8 +4,8 @@ fun box(): String {
val instances = E.INSTANCES
if (E.foo != 42)
return "Wrong foo ${E.foo}"
if (instances.size() != 1)
return "Wrong size ${instances.size()}"
if (instances.size != 1)
return "Wrong size ${instances.size}"
if (E.INSTANCES.iterator().next() != E.INSTANCE)
return "Wrong instance ${E.INSTANCES.iterator().next()}"
return "OK"
compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ fun box(): String {
return "Fail: should have been an exception"
}
catch(e: IllegalStateException) {
println(e.getMessage())
println(e.message)
return "OK"
}
}
compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.reflect.jvm.*
import kotlin.test.assertEquals
fun box(): String {
val j = javaClass<J>()
val j = J::class.java
assertEquals(j, j.kotlin.java)
return "OK"
compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ class Impl: JavaInterface {
}
fun box(): String {
val fooMethods = javaClass<Impl>().getMethods().filter { it.getName() == "foo" }
if (fooMethods.size() != 1) return fooMethods.toString()
val fooMethods = Impl::class.java.getMethods().filter { it.getName() == "foo" }
if (fooMethods.size != 1) return fooMethods.toString()
return "OK"
}
compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun box(): String {
var v = "FAIL"
val max = JavaClass.findMaxAndInvokeCallback({ a, b -> a.length() - b.length() }, "foo", "kotlin", { v = "OK" })
val max = JavaClass.findMaxAndInvokeCallback({ a, b -> a.length - b.length }, "foo", "kotlin", { v = "OK" })
if (max != "kotlin") return "Wrong max: $max"
return v
}
compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun box(): String {
val wc = WeirdComparator<String>()
val result = wc.max({ a, b -> a.length() - b.length() }, "java", "kotlin")
val result = wc.max({ a, b -> a.length - b.length }, "java", "kotlin")
if (result != "kotlin") return "Wrong: $result"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
fun box(): String {
val result = WeirdComparator.max<String>({ a, b -> a.length() - b.length() }, "java", "kotlin")
val result = WeirdComparator.max<String>({ a, b -> a.length - b.length }, "java", "kotlin")
if (result != "kotlin") return "Wrong: $result"
val result2 = WeirdComparator.max2<String>({ a, b -> a.length() - b.length() }, "java", "kotlin")
val result2 = WeirdComparator.max2<String>({ a, b -> a.length - b.length }, "java", "kotlin")
if (result2 != "kotlin") return "Wrong: $result"
return "OK"
compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun box(): String {
val wc = WeirdComparator<String>().createInner()!!
val result = wc.max({ a, b -> a.length() - b.length() }, "java", "kotlin")
val result = wc.max({ a, b -> a.length - b.length }, "java", "kotlin")
if (result != "kotlin") return "Wrong: $result"
return "OK"
}