From cfadda8061c8650c257ed994d611f33ba61cd714 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 18 Jun 2015 13:33:19 +0300
Subject: [PATCH] Fix codegen tests after types enhancement

---
 .../box/builtinStubMethods/extendJavaCollections/abstractMap.kt | 2 +-
 .../codegen/boxWithStdlib/reflection/enclosing/kt6368.kt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
index 59f2d50e8ad..1a7f0ae1eb2 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
@@ -2,7 +2,7 @@ import java.util.AbstractMap
 import java.util.Collections
 
 class A : AbstractMap<Int, String>() {
-    override fun entrySet(): Set<Map.Entry<Int, String>> = Collections.emptySet()
+    override fun entrySet(): MutableSet<MutableMap.MutableEntry<Int, String>> = Collections.emptySet()
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt
index 16d226f3c0d..8547b6a5178 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt
@@ -15,7 +15,7 @@ val a by Delegates.lazy {
 }
 
 fun box(): String {
-    val r = a["result"]
+    val r = a["result"]!!
 
     // Check that reflection won't fail
     r.javaClass.getEnclosingMethod().toString()