From c7d08ea5995d485af0543a31af4a93587dc2bfe6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 26 Nov 2015 05:56:42 +0300
Subject: [PATCH] Remove *Raw method usages from tests

---
 .../test/collections/CollectionBehaviors.kt      | 16 ++++++++--------
 .../stdlib/test/collections/CollectionTest.kt    |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/stdlib/test/collections/CollectionBehaviors.kt b/libraries/stdlib/test/collections/CollectionBehaviors.kt
index 47bb716df45..ec0368d2196 100644
--- a/libraries/stdlib/test/collections/CollectionBehaviors.kt
+++ b/libraries/stdlib/test/collections/CollectionBehaviors.kt
@@ -32,8 +32,8 @@ public fun <T> CompareContext<List<T>>.listBehavior() {
 
     propertyFails { this[size] }
 
-    propertyEquals { (this as List<T?>).indexOf(elementAtOrNull(0)) }
-    propertyEquals { (this as List<T?>).lastIndexOf(elementAtOrNull(0)) }
+    propertyEquals { indexOf(elementAtOrNull(0)) }
+    propertyEquals { lastIndexOf(elementAtOrNull(0)) }
 
     propertyFails { subList(0, size + 1)}
     propertyFails { subList(-1, 0)}
@@ -84,14 +84,14 @@ public fun <K, V> CompareContext<Map<K, V>>.mapBehavior() {
     propertyEquals { size }
     propertyEquals { isEmpty() }
 
-    (object {}).let { propertyEquals { containsKey(it)}  }
+    (object {}).let { propertyEquals { containsKey(it as Any?) }  }
 
     if (expected.isEmpty().not())
         propertyEquals { contains(keys.first()) }
 
-    propertyEquals { containsKeyRaw(keys.firstOrNull()) }
-    propertyEquals { containsValueRaw(values.firstOrNull()) }
-    propertyEquals { getRaw(null) }
+    propertyEquals { containsKey(keys.firstOrNull()) }
+    propertyEquals { containsValue(values.firstOrNull()) }
+    propertyEquals { get(null as Any?) }
 
     compareProperty( { keys }, { setBehavior("keySet") } )
     compareProperty( { entries }, { setBehavior("entrySet") } )
@@ -111,8 +111,8 @@ public fun <T> CompareContext<Collection<T>>.collectionBehavior(objectName: Stri
     propertyEquals (prefix + "size") { size }
     propertyEquals (prefix + "isEmpty") { isEmpty() }
 
-    (object {}).let { propertyEquals { containsRaw(it)}  }
-    propertyEquals { contains<T?>(firstOrNull()) }
+    (object {}).let { propertyEquals { contains(it as Any?) }  }
+    propertyEquals { contains(firstOrNull()) }
     propertyEquals { containsAll(this) }
 }
 
diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt
index cd280bfc48c..a23a175c8ce 100644
--- a/libraries/stdlib/test/collections/CollectionTest.kt
+++ b/libraries/stdlib/test/collections/CollectionTest.kt
@@ -4,6 +4,7 @@ import java.util.*
 import kotlin.test.*
 import org.junit.Test as test
 import test.collections.behaviors.*
+import java.io.Serializable
 
 class CollectionTest {