From 32c371dd4118f3a94f9e2cd20c3747d8267cfca2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 10 Feb 2015 20:14:44 +0300 Subject: [PATCH] Minor, uncomment previously failing checks #KT-5092 Fixed --- .../reflection/enclosing/insideLambda/classInLambda.kt | 7 +++---- .../reflection/enclosing/insideLambda/objectInLambda.kt | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt index fcfbbfe1435..8e91a0ecb02 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt @@ -11,9 +11,8 @@ fun box(): String { val enclosingClass = classInLambda.javaClass.getEnclosingClass()!!.getName() if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$classInLambda\$1")) return "enclosing class: $enclosingClass" - //KT-5092 - //val declaringClass = classInLambda.javaClass.getDeclaringClass() - //if (declaringClass == null) return "class hasn't a declaring class" + val declaringClass = classInLambda.javaClass.getDeclaringClass() + if (declaringClass != null) return "class has a declaring class" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt index 2878443ed39..e0a33aca64d 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt @@ -10,9 +10,8 @@ fun box(): String { val enclosingClass = objectInLambda.javaClass.getEnclosingClass()!!.getName() if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$objectInLambda\$1")) return "enclosing class: $enclosingClass" - //KT-5092 - //val declaringClass = objectInLambda.javaClass.getDeclaringClass() - //if (declaringClass == null) return "anonymous object hasn't a declaring class" + val declaringClass = objectInLambda.javaClass.getDeclaringClass() + if (declaringClass != null) return "anonymous object has a declaring class" return "OK" -} \ No newline at end of file +}