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"
}
compiler/testData/codegen/boxInline/builders/builders.2.kt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ abstract class Tag(val name: String) : Element() {
private fun renderAttributes(): String? {
val builder = StringBuilder()
for (a in attributes.keySet()) {
for (a in attributes.keys) {
builder.append(" $a=\"${attributes[a]}\"")
}
return builder.toString()
compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ abstract class Tag(val name: String) : Element() {
private fun renderAttributes(): String? {
val builder = StringBuilder()
for (a in attributes.keySet()) {
for (a in attributes.keys) {
builder.append(" $a=\"${attributes[a]}\"")
}
return builder.toString()
compiler/testData/codegen/boxInline/complex/closureChain.1.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun test1(): Int {
val inlineX = Inline()
return inlineX.foo({ z: Int -> "" + z}, 25, fun String.(): Int = this.length())
return inlineX.foo({ z: Int -> "" + z}, 25, fun String.(): Int = this.length)
}
fun box(): String {
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.2.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public class Holder(var value: String = "") {
operator fun plusAssign(s: String?) {
if (value.length() != 0) {
if (value.length != 0) {
value += " -> "
}
value += s
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.2.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public class Holder(var value: String = "") {
operator fun plusAssign(s: String?) {
if (value.length() != 0) {
if (value.length != 0) {
value += " -> "
}
value += s
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ class Test() : MCloseable {
throw MyException("exception")
}
catch (e: MyException) {
status += e.getMessage()
status += e.message
return status
}
finally {
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt
Vendored
+2 -2
View File
@@ -32,8 +32,8 @@ fun test0(h: Holder): String {
return localResult;
}
catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
}
else {
return "CATCHED_EXCEPTION"
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt
Vendored
+2 -2
View File
@@ -56,9 +56,9 @@ fun test0(
}, res)
return localResult;
} catch(e: Exception1) {
return e.getMessage()!!
return e.message!!
} catch(e: Exception2) {
return e.getMessage()!!
return e.message!!
}
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt
Vendored
+2 -2
View File
@@ -28,9 +28,9 @@ fun test0(
}, res)
return localResult;
} catch(e: Exception1) {
return e.getMessage()!!
return e.message!!
} catch(e: Exception2) {
return e.getMessage()!!
return e.message!!
}
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt
Vendored
+2 -2
View File
@@ -76,8 +76,8 @@ fun test5(h: Holder): String {
return localResult;
} catch (e: RuntimeException) {
if (e.getMessage() != "EXCEPTION") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "EXCEPTION") {
return "FAIL in exception: " + e.message
} else {
return "CATCHED_EXCEPTION"
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt
Vendored
+6 -6
View File
@@ -28,8 +28,8 @@ fun test0(h: Holder): String {
return localResult;
}
catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
}
else {
return "CATCHED_EXCEPTION"
@@ -108,8 +108,8 @@ fun test1(h: Holder): String {
}, "Fail")
}
catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
}
else {
return "CATCHED_EXCEPTION"
@@ -172,8 +172,8 @@ fun test3(h: Holder): String {
}, "Fail")
}
catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
}
else {
return "CATCHED_EXCEPTION"
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt
Vendored
+8 -8
View File
@@ -23,8 +23,8 @@ fun test0(h: Holder): String {
return localResult;
} catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
} else {
return "CATCHED_EXCEPTION"
}
@@ -51,8 +51,8 @@ fun test1(h: Holder): String {
"OK_FINALLY"
})
} catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
} else {
return "CATCHED_EXCEPTION"
}
@@ -100,8 +100,8 @@ fun test3(h: Holder): String {
"OK_FINALLY"
})
} catch (e: RuntimeException) {
if (e.getMessage() != "FINALLY") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "FINALLY") {
return "FAIL in exception: " + e.message
} else {
return "CATCHED_EXCEPTION"
}
@@ -128,8 +128,8 @@ fun test4(h: Holder): String {
"OK_FINALLY"
})
} catch (e: RuntimeException) {
if (e.getMessage() != "EXCEPTION") {
return "FAIL in exception: " + e.getMessage()
if (e.message != "EXCEPTION") {
return "FAIL in exception: " + e.message
} else {
return "CATCHED_EXCEPTION"
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt
Vendored
+2 -2
View File
@@ -30,9 +30,9 @@ fun test0(
res)
return localResult;
} catch(e: Exception1) {
return e.getMessage()!!
return e.message!!
} catch(e: Exception2) {
return e.getMessage()!!
return e.message!!
}
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.2.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public class Holder(var value: String = "") {
operator fun plusAssign(s: String?) {
if (value.length() != 0) {
if (value.length != 0) {
value += " -> "
}
value += s
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ inline fun <T> bar(arg: String, action: () -> T) {
try {
action()
} finally {
arg.length()
arg.length
}
}
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ public class ClassA {
result = name + name2
val length = name.length()
val length = name.length
}
}
}
compiler/testData/codegen/boxInline/reified/kt6988_2.2.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ package test
public inline fun <reified T: Any> Any.inlineMeIfYouCan() : () -> Runnable = {
object : Runnable {
override fun run() {
javaClass<T>().newInstance()
T::class.java.newInstance()
}
}
}
compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
Vendored
+1 -1
View File
@@ -5,6 +5,6 @@ enum class MyEnum {
//TODO: KT-4693
inline fun <T> doSmth(a: T) : String {
return a.toString() + K.name()
return a.toString() + K.name
}
}
compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@ fun test2() : Int {
}
return result
} catch (e: RuntimeException) {
return e.getMessage()!!.toInt2()!!
return e.message!!.toInt2()!!
}
}
compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
Vendored
+4 -4
View File
@@ -18,7 +18,7 @@ fun test11(): Int {
}
},
{ ex, thizz ->
if (ex.getMessage() == "2") {
if (ex.message == "2") {
thizz.value
} else {
-11111
@@ -66,7 +66,7 @@ fun test3(): Int {
})
return res
} catch (e: RuntimeException) {
return e.getMessage()?.toInt2()!!
return e.message?.toInt2()!!
}
}
@@ -81,7 +81,7 @@ fun test33(): Int {
}
},
{ ex, thizz ->
if (ex.getMessage() == "-2") {
if (ex.message == "-2") {
throw RuntimeException("-3")
} else {
-11111
@@ -89,7 +89,7 @@ fun test33(): Int {
})
return res
} catch (e: RuntimeException) {
return e.getMessage()!!.toInt2()!!
return e.message!!.toInt2()!!
}
}
compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@ fun test3(): Int {
})
return res
} catch (e: RuntimeException) {
return e.getMessage()?.toInt()!!
return e.message?.toInt()!!
}
}
compiler/testData/codegen/boxMultiFile/kt1515/1.kt
Vendored
+1 -1
View File
@@ -13,6 +13,6 @@ fun box(): String {
}
fun localUse(): Boolean {
val c = javaClass<Runnable>()
val c = Runnable::class.java
return (c.getName()!! == "java.lang.Runnable")
}
compiler/testData/codegen/boxMultiFile/kt1515/2.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package otherpackage
fun fromOtherPackage(): Boolean {
val c = javaClass<Runnable>()
val c = Runnable::class.java
return (c.getName()!! == "java.lang.Runnable")
}
compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/annotatedSamFunExpression.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ import kotlin.test.assertEquals
annotation class Ann(val x: String)
fun testMethod(method: Method, name: String) {
assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
val ann = annotations.filterIsInstance<Ann>().single()
compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
annotation class Ann(val x: String)
fun testMethod(method: Method, name: String) {
assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
val ann = annotations.filterIsInstance<Ann>().single()
compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/array.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.reflect.KClass
annotation class Ann(val args: Array<KClass<*>>)
fun box(): String {
val args = javaClass<Test>().getAnnotation(javaClass<Ann>()).args
val args = Test::class.java.getAnnotation(Ann::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/basic.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ import kotlin.reflect.KClass
annotation class Ann(val arg: KClass<*>)
fun box(): String {
val argName = javaClass<Test>().getAnnotation(javaClass<Ann>()).arg.simpleName ?: "fail 1"
val argName = Test::class.java.getAnnotation(Ann::class.java).arg.simpleName ?: "fail 1"
return argName
}
compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/vararg.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.reflect.KClass
annotation class Ann(vararg val args: KClass<*>)
fun box(): String {
val args = javaClass<Test>().getAnnotation(javaClass<Ann>()).args
val args = Test::class.java.getAnnotation(Ann::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/extendJavaCollections.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ class MyMapEntry : Test.MapEntryImpl()
fun box(): String {
val b = MyMapEntry()
b.getKey()
b.getValue()
b.key
b.value
b.setValue(null)
return "OK"
compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/K.kt
Vendored
+2 -2
View File
@@ -4,10 +4,10 @@ import kotlin.test.assertEquals
fun box(): String {
val f = J::foo
assertEquals(
listOf(javaClass<J>(), javaClass<IntArray>(), javaClass<Array<Any>>(), javaClass<Integer>()),
listOf(J::class.java, IntArray::class.java, Array<Any>::class.java, Integer::class.java),
f.parameters.map { it.type.javaType }
)
assertEquals(javaClass<String>(), f.returnType.javaType)
assertEquals(String::class.java, f.returnType.javaType)
assertEquals("01A2", f.call(J(0), intArrayOf(1), arrayOf("A"), 2))
compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ import kotlin.test.*
fun box(): String {
val c = J::class.constructors.single()
assertFalse(c.isAccessible)
assertFailsWith(javaClass<IllegalCallableAccessException>()) { c.call("") }
assertFailsWith(IllegalCallableAccessException::class.java) { c.call("") }
c.isAccessible = true
assertTrue(c.isAccessible)
@@ -13,7 +13,7 @@ fun box(): String {
val m = J::class.members.single { it.name == "getResult" }
assertFalse(m.isAccessible)
assertFailsWith(javaClass<IllegalCallableAccessException>()) { m.call(j)!! }
assertFailsWith(IllegalCallableAccessException::class.java) { m.call(j)!! }
m.isAccessible = true
return m.call(j) as String
compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/K.kt
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ import kotlin.test.assertEquals
fun box(): String {
val f = J::foo
assertEquals(listOf(Integer.TYPE, javaClass<IntArray>(), javaClass<Array<Any>>()), f.parameters.map { it.type.javaType })
assertEquals(javaClass<String>(), f.returnType.javaType)
assertEquals(listOf(Integer.TYPE, IntArray::class.java, Array<Any>::class.java), f.parameters.map { it.type.javaType })
assertEquals(String::class.java, f.returnType.javaType)
assertEquals("01A", f.call(0, intArrayOf(1), arrayOf("A")))
compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/K.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ fun box(): String {
assertEquals(listOf("equals", "hashCode", "member", "staticMethod", "toString"), J::class.functions.map { it.name }.sorted())
assertEquals(listOf("member", "staticMethod"), J::class.declaredFunctions.map { it.name }.sorted())
assertEquals(1, J::class.constructors.size())
assertEquals(1, J::class.constructors.size)
return "OK"
}
compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun box(): String {
if (prop == K::prop) return "Fail J::prop == K::prop (these are different properties)"
val klass = javaClass<J>().kotlin
val klass = J::class.java.kotlin
if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"
compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
Vendored
+5 -5
View File
@@ -17,15 +17,15 @@ enum class E {
}
fun box(): String {
val e = javaClass<E>()
val e = E::class.java
val e1 = e.getDeclaredField(E.E1.toString()).getAnnotations()
if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
if (e1[0].annotationType() != javaClass<First>()) return "Fail E1: ${e1.toList()}"
if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
if (e1[0].annotationClass.java != First::class.java) return "Fail E1: ${e1.toList()}"
val e2 = e.getDeclaredField(E.E2.toString()).getAnnotations()
if (e2.size() != 1) return "Fail E2 size: ${e2.toList()}"
if (e2[0].annotationType() != javaClass<Second>()) return "Fail E2: ${e2.toList()}"
if (e2.size != 1) return "Fail E2 size: ${e2.toList()}"
if (e2[0].annotationClass.java != Second::class.java) return "Fail E2: ${e2.toList()}"
return (e2[0] as Second).value
}
compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun foo0(block: () -> Unit) = block.javaClass
fun foo1(block: (String) -> Unit) = block.javaClass
fun testMethod(method: Method, name: String) {
assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
val ann = annotations.filterIsInstance<Ann>().single()
compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ annotation class Ann(val x: String)
fun foo0(block: () -> Unit) = block.javaClass
fun testMethod(method: Method, name: String) {
assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
val ann = annotations.filterIsInstance<Ann>().single()
compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
Vendored
+4 -4
View File
@@ -15,18 +15,18 @@ fun test(name: String, annotations: Array<out Annotation>) {
}
fun box(): String {
val foo = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo" }
val foo = A::class.java.getDeclaredMethods().first { it.getName() == "foo" }
test("foo", foo.getDeclaredAnnotations())
val fooDefault = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo\$default" }
val fooDefault = A::class.java.getDeclaredMethods().first { it.getName() == "foo\$default" }
test("foo", foo.getDeclaredAnnotations())
val (secondary, secondaryDefault) = javaClass<A>().getDeclaredConstructors().partition { it.getParameterTypes().size() == 3 }
val (secondary, secondaryDefault) = A::class.java.getDeclaredConstructors().partition { it.getParameterTypes().size == 3 }
test("secondary", secondary[0].getDeclaredAnnotations())
test("secondary\$default", secondaryDefault[0].getDeclaredAnnotations())
val (primary, primaryDefault) = javaClass<B>().getConstructors().partition { it.getParameterTypes().size() == 3 }
val (primary, primaryDefault) = B::class.java.getConstructors().partition { it.getParameterTypes().size == 3 }
test("primary", primary[0].getDeclaredAnnotations())
test("primary\$default", primaryDefault[0].getDeclaredAnnotations())
compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
Vendored
+3 -3
View File
@@ -12,14 +12,14 @@ annotation class Ann(
)
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 != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
if (ann.s != "a") return "fail: annotation parameter s should be \"a\", but was ${ann.s}"
val annSimpleName = ann.a.annotationType().getSimpleName()
val annSimpleName = ann.a.annotationClass.java.getSimpleName()
if (annSimpleName != "Ann2") return "fail: annotation parameter a should be of class Ann2, but was $annSimpleName"
if (ann.e != MyEnum.A) return "fail: annotation parameter e should be MyEnum.A, but was ${ann.e}"
if (ann.c.java != javaClass<A>()) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
if (ann.c.java != A::class.java) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
if (ann.ia[0] != 1 || ann.ia[1] != 2) return "fail: annotation parameter ia should be [1, 2], but was ${ann.ia}"
if (ann.sa[0] != "a" || ann.sa[1] != "b") return "fail: annotation parameter ia should be [\"a\", \"b\"], but was ${ann.sa}"
return "OK"
compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
Vendored
+4 -4
View File
@@ -17,11 +17,11 @@ class Delegate {
}
fun box(): String {
val e = javaClass<MyClass>()
val e = MyClass::class.java
val e1 = e.getDeclaredMethod("setX", javaClass<String>()).getAnnotations()
if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
if (e1[0].annotationType() != javaClass<First>()) return "Fail: ${e1.toList()}"
val e1 = e.getDeclaredMethod("setX", String::class.java).getAnnotations()
if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
if (e1[0].annotationClass.java != First::class.java) return "Fail: ${e1.toList()}"
return MyClass().x
}
compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.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) 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/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(i, s, f, d, l, b, bool, c, str) 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/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(A.B.i) 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 != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
return "OK"
compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ annotation class Ann(
)
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.b != 1.toByte()) return "fail: annotation parameter b should be 1, but was ${ann.b}"
if (ann.s != 1.toShort()) return "fail: annotation parameter s should be 1, but was ${ann.s}"
compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@Ann(i) 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 != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
return "OK"
compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
Vendored
+11 -11
View File
@@ -16,25 +16,25 @@ annotation class Ann(vararg val p: Int)
@Ann(p = *intArrayOf(1, 2)) class MyClass10
fun box(): String {
test(javaClass<MyClass1>(), "")
test(javaClass<MyClass2>(), "1")
test(javaClass<MyClass3>(), "12")
test(MyClass1::class.java, "")
test(MyClass2::class.java, "1")
test(MyClass3::class.java, "12")
test(javaClass<MyClass4>(), "")
test(javaClass<MyClass5>(), "1")
test(javaClass<MyClass6>(), "12")
test(MyClass4::class.java, "")
test(MyClass5::class.java, "1")
test(MyClass6::class.java, "12")
test(javaClass<MyClass7>(), "1")
test(MyClass7::class.java, "1")
test(javaClass<MyClass8>(), "")
test(javaClass<MyClass9>(), "1")
test(javaClass<MyClass10>(), "12")
test(MyClass8::class.java, "")
test(MyClass9::class.java, "1")
test(MyClass10::class.java, "12")
return "OK"
}
fun test(klass: Class<*>, expected: String) {
val ann = klass.getAnnotation(javaClass<Ann>())
val ann = klass.getAnnotation(Ann::class.java)
if (ann == null) throw AssertionError("fail: cannot find Ann on ${klass}")
var result = ""
compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ fun box(): String {
val x : Array<Array<*>> = arrayOf(arrayOf(1))
val y : Array<in Array<String>> = x
if (y.size() != 1) return "fail 1"
if (y.size != 1) return "fail 1"
y[0] = arrayOf("OK")
compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ fun box(): String {
val x: Array<List<*>> = arrayOf(listOf(1))
val y : Array<in List<String>> = x
if (y.size() != 1) return "fail 1"
if (y.size != 1) return "fail 1"
y[0] = listOf("OK")
compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
fun box() : String {
val data = Array<Array<Boolean>>(3) { Array<Boolean>(4, {false}) }
for(d in data) {
if(d.size() != 4) return "fail"
if(d.size != 4) return "fail"
for(b in d) if (b) return "fail"
}
compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ class MutableArray<T>(length: Int, init : (Int) -> T) : ReadOnlyArray<T>, WriteO
override fun set(index : Int, value : T) : Unit { array[index] = value }
override val size : Int
get() = array.size()
get() = array.size
}
fun box() : String {
compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt
Vendored
+4 -4
View File
@@ -4,22 +4,22 @@ import kotlin.test.assertEquals
fun box() : String {
val result1 = (1..100).count { x -> x % 2 == 0 }
val result2 = (1..100).filter { x -> x % 2 == 0 }.size()
val result2 = (1..100).filter { x -> x % 2 == 0 }.size
assertEquals(result1, 50)
assertEquals(result2, 50)
val result3 = (1..100).map { x -> 2 * x }.count { x -> x % 2 == 0 }
val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size()
val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size
assertEquals(result3, 100)
assertEquals(result4, 100)
val result5 = (1L..100L).count { x -> x % 2 == 0L }
val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size()
val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size
assertEquals(result5, 50)
assertEquals(result6, 50)
val result7 = (1L..100L).map { x -> 2 * x }.count { x -> x % 2 == 0L }
val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size()
val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size
assertEquals(result7, 100)
assertEquals(result8, 100)
compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt
Vendored
+1 -1
View File
@@ -118,7 +118,7 @@ fun box(): String {
asSucceeds("mentry as MutableMap.MutableEntry") { mentry as MutableMap.MutableEntry<*, *> }
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
asSucceeds("hashMapEntry as MutableMap.MutableEntry") { hashMapEntry as MutableMap.MutableEntry<*, *> }
compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt
Vendored
+1 -1
View File
@@ -96,7 +96,7 @@ fun box(): String {
val mentry = MME()
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
assert(entry !is MutableMap.MutableEntry<*, *>) { "ME should satisfy '!is MutableMap.MutableEntry'"}
assert(mentry is MutableMap.MutableEntry<*, *>) { "MME should satisfy 'is MutableMap.MutableEntry'"}
compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt
Vendored
+1 -1
View File
@@ -118,7 +118,7 @@ fun box(): String {
val mentry = MME()
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
reifiedAsFailsWithCCE<MutableMap.MutableEntry<*, *>>(entry, "reifiedAs<MutableMap.MutableEntry<*, *>>(entry)")
reifiedAsSucceeds<MutableMap.MutableEntry<*, *>>(mentry, "reifiedAs<MutableMap.MutableEntry<*, *>>(mentry)")
compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt
Vendored
+1 -1
View File
@@ -99,7 +99,7 @@ fun box(): String {
val mentry = MME()
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
assert(reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)) { "reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)"}
assert(reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)) { "reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)"}
compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt
Vendored
+1 -1
View File
@@ -120,7 +120,7 @@ fun box(): String {
val mentry = MME()
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
reifiedSafeAsReturnsNull<MutableMap.MutableEntry<*, *>>(entry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(entry)")
reifiedSafeAsReturnsNonNull<MutableMap.MutableEntry<*, *>>(mentry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(mentry)")
compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt
Vendored
+1 -1
View File
@@ -117,7 +117,7 @@ fun box(): String {
safeAsReturnsNonNull("mentry as? MutableMap.MutableEntry") { mentry as? MutableMap.MutableEntry<*, *> }
hashMap[""] = ""
val hashMapEntry = hashMap.entrySet().first()
val hashMapEntry = hashMap.entries.first()
safeAsReturnsNonNull("hashMapEntry as? MutableMap.MutableEntry") { hashMapEntry as? MutableMap.MutableEntry<*, *> }
compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun box(): String {
return "OK"
}
catch (e: Throwable) {
return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.getMessage()}"
return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.message}"
}
return "Fail: no exception was thrown"
compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
Vendored
+1 -1
View File
@@ -26,5 +26,5 @@ fun box(): String {
if (A(-2.72) !in s) return "Fail: -2.72 not found"
if (A(NAN) !in s) return "Fail: NaN not found"
return if (s.size() == 5) "OK" else "Fail $s"
return if (s.size == 5) "OK" else "Fail $s"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt
Vendored
+8 -8
View File
@@ -16,17 +16,17 @@ data class E(val x: Int) {
}
fun box(): String {
javaClass<B>().getDeclaredMethod("equals", javaClass<Any>())
javaClass<B>().getDeclaredMethod("equals", javaClass<B>())
B::class.java.getDeclaredMethod("equals", Any::class.java)
B::class.java.getDeclaredMethod("equals", B::class.java)
javaClass<C>().getDeclaredMethod("equals", javaClass<Any>())
javaClass<C>().getDeclaredMethod("equals")
C::class.java.getDeclaredMethod("equals", Any::class.java)
C::class.java.getDeclaredMethod("equals")
javaClass<D>().getDeclaredMethod("equals", javaClass<Any>())
javaClass<D>().getDeclaredMethod("equals", javaClass<Any>(), javaClass<String>())
D::class.java.getDeclaredMethod("equals", Any::class.java)
D::class.java.getDeclaredMethod("equals", Any::class.java, String::class.java)
javaClass<E>().getDeclaredMethod("equals", javaClass<Any>())
javaClass<E>().getDeclaredMethod("equals", javaClass<E>())
E::class.java.getDeclaredMethod("equals", Any::class.java)
E::class.java.getDeclaredMethod("equals", E::class.java)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
Vendored
+1 -1
View File
@@ -26,5 +26,5 @@ fun box(): String {
if (A(-2.72f) !in s) return "Fail: -2.72 not found"
if (A(NAN) !in s) return "Fail: NaN not found"
return if (s.size() == 5) "OK" else "Fail $s"
return if (s.size == 5) "OK" else "Fail $s"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt
Vendored
+4 -4
View File
@@ -7,11 +7,11 @@ data class B(val x: Int) {
}
fun box(): String {
javaClass<A>().getDeclaredMethod("hashCode")
javaClass<A>().getDeclaredMethod("hashCode", javaClass<Any>())
A::class.java.getDeclaredMethod("hashCode")
A::class.java.getDeclaredMethod("hashCode", Any::class.java)
javaClass<B>().getDeclaredMethod("hashCode")
javaClass<B>().getDeclaredMethod("hashCode", javaClass<B>(), javaClass<Any>())
B::class.java.getDeclaredMethod("hashCode")
B::class.java.getDeclaredMethod("hashCode", B::class.java, Any::class.java)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt
Vendored
+4 -4
View File
@@ -7,11 +7,11 @@ data class B(val x: Int) {
}
fun box(): String {
javaClass<A>().getDeclaredMethod("toString")
javaClass<A>().getDeclaredMethod("toString", javaClass<Any>())
A::class.java.getDeclaredMethod("toString")
A::class.java.getDeclaredMethod("toString", Any::class.java)
javaClass<B>().getDeclaredMethod("toString")
javaClass<B>().getDeclaredMethod("toString", javaClass<B>(), javaClass<Any>())
B::class.java.getDeclaredMethod("toString")
B::class.java.getDeclaredMethod("toString", B::class.java, Any::class.java)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
class A(value: Int = 1)
fun box(): String {
val constructors = javaClass<A>().getConstructors().filter { !it.isSynthetic() }
return if (constructors.size() == 2) "OK" else constructors.size().toString()
val constructors = A::class.java.getConstructors().filter { !it.isSynthetic() }
return if (constructors.size == 2) "OK" else constructors.size.toString()
}
compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt
Vendored
+3 -3
View File
@@ -160,7 +160,7 @@ class C(val a: Int = 1,
fun box(): String {
val test1 = A(4, e = 8, f = 15, w = 16, aa = 23, ff = 42).toString()
val test2 = javaClass<A>().newInstance().toString()
val test2 = A::class.java.newInstance().toString()
val test3 = A(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, q = 16, r = 15, s = 14, t = 13,
u = 12, v = 11, w = 10, x = 9, y = 8, z = 7, aa = 6, bb = 5, cc = 4, dd = 3, ee = 2, ff = 1).toString()
if (test1 != "4 2 3 4 8 15 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 16 24 25 26 23 28 29 30 31 42") {
@@ -174,7 +174,7 @@ fun box(): String {
}
val test4 = B(54, 217, h = 236, l = 18, q = 3216, u = 8, aa = 22, ff = 33, jj = 44, mm = 55).toString()
val test5 = javaClass<B>().newInstance().toString()
val test5 = B::class.java.newInstance().toString()
val test6 = B(40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, u = 20, v = 19,
w = 18, x = 17, y = 16, z = 15, aa = 14, bb = 13, cc = 12, dd = 11, ee = 10, ff = 9, gg = 8, hh = 7, ii = 6,
jj = 5, kk = 4, ll = 3, mm = 2, nn = 1).toString()
@@ -189,7 +189,7 @@ fun box(): String {
}
val test7 = C(5, f = 3, w = 1, aa = 71, nn = 2, qq = 15, ww = 97, aaa = 261258, iii = 3, nnn = 8, rrr = 7).toString()
val test8 = javaClass<C>().newInstance().toString()
val test8 = C::class.java.newInstance().toString()
val test9 = C(70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41,
40, 39, 38, 37, 36, jj = 35, kk = 34, ll = 33, mm = 32, nn = 31, oo = 30, pp = 29, qq = 28, rr = 27, ss = 26, tt = 25,
uu = 24, vv = 23, ww = 22, xx = 21, yy = 20, zz = 19, aaa = 18, bbb = 17, ccc = 16, ddd = 15, eee = 14, fff = 13,
compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ annotation class Ann(val c1: Int)
@Ann('a' - 'a') class MyClass
fun box(): String {
val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
if (annotation.c1 != 0) return "fail : expected = ${1}, actual = ${annotation.c1}"
return "OK"
}
compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ annotation class Ann(
@Ann(1 / 1, 1 / 1, 1 / 1, 1 / 1) class MyClass
fun box(): String {
val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
if (annotation.b != 1.toByte()) return "fail 1"
if (annotation.s != 1.toShort()) return "fail 2"
if (annotation.i != 1) return "fail 2"
compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ val prop6: Int = 1 ushr 1
@Ann(1 or 1, 1 and 1, 1 xor 1, 1 shl 1, 1 shr 1, 1 ushr 1) class MyClass
fun box(): String {
val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ annotation class Ann(
) class MyClass
fun box(): String {
val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
if (annotation.p1 != 128) return "fail 1, expected = ${128}, actual = ${annotation.p1}"
if (annotation.p2 != 32768) return "fail 2, expected = ${32768}, actual = ${annotation.p2}"
if (annotation.p3 != -2147483648) return "fail 3, expected = ${-2147483648}, actual = ${annotation.p3}"

Some files were not shown because too many files have changed in this diff Show More