diff --git a/compiler/testData/codegen/regressions/kt1482.kt b/compiler/testData/codegen/regressions/kt1482.kt index f651196a18b..d93739f5227 100644 --- a/compiler/testData/codegen/regressions/kt1482.kt +++ b/compiler/testData/codegen/regressions/kt1482.kt @@ -2,7 +2,7 @@ abstract class ClassValAbstract { abstract val a: Int class object { - val methods = (this as java.lang.Object).getClass()?.classLoader?.loadClass("ClassValAbstract")?.getMethods() + val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods() } } @@ -18,4 +18,4 @@ fun box() : String { } } return "OK" -} \ No newline at end of file +} diff --git a/testlib/test/TestDslExample.kt b/testlib/test/TestDslExample.kt index 7ca5a3343f7..4e8ce5d4121 100644 --- a/testlib/test/TestDslExample.kt +++ b/testlib/test/TestDslExample.kt @@ -12,49 +12,49 @@ public val suite : TestSuite? = testSuite("test group") { setUp = { staticState += 10 state = staticState - println("test '$name' started") + println("test '${getName()}' started") } tearDown = { - println("test '$name' ended") + println("test '${getName()}' ended") } "test 1" - { Assert.assertEquals(state, 20) - println("test '$name': state: $state") + println("test '${getName()}': state: $state") } "test 2" - { assert(state == 31, "message") - println("test '$name': state: $state") + println("test '${getName()}': state: $state") } "test 3" - { Assert.assertEquals(state, 40) - println("test '$name': state: $state") + println("test '${getName()}': state: $state") } testSuite("nested test suite") { setUp = { staticState += 10 state = staticState - println("nested test '$name' started") + println("nested test '${getName()}' started") } tearDown = { - println("nested test '$name' ended") + println("nested test '${getName()}' ended") } "nested test 1" - { - println("test '$name'") + println("test '${getName()}'") } "nested test 2" - { - println("test '$name'") + println("test '${getName()}'") } "nested test 3" - { - println("test '$name'") + println("test '${getName()}'") } } }