From c5c6eed1701ffacad63f26531b38df4fee4569de Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 25 Dec 2017 21:26:37 +0300
Subject: [PATCH] Make common ArrayList declaration not open and implementing
 RandomAccess

---
 libraries/stdlib/common/src/kotlin/collections/ArrayList.kt | 2 +-
 libraries/stdlib/test/collections/CollectionTest.kt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/common/src/kotlin/collections/ArrayList.kt b/libraries/stdlib/common/src/kotlin/collections/ArrayList.kt
index b35e0204183..40bf64be1e5 100644
--- a/libraries/stdlib/common/src/kotlin/collections/ArrayList.kt
+++ b/libraries/stdlib/common/src/kotlin/collections/ArrayList.kt
@@ -16,7 +16,7 @@
 
 package kotlin.collections
 
-expect open class ArrayList<E> : MutableList<E> {
+expect class ArrayList<E> : MutableList<E>, RandomAccess {
     constructor()
     constructor(initialCapacity: Int)
     constructor(elements: Collection<E>)
diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt
index c5da57b7a13..ce1f96f8ec9 100644
--- a/libraries/stdlib/test/collections/CollectionTest.kt
+++ b/libraries/stdlib/test/collections/CollectionTest.kt
@@ -901,7 +901,7 @@ class CollectionTest {
     }
 
     @Test fun randomAccess() {
-        assertTrue(arrayListOf(1) is RandomAccess, "ArrayList is RandomAccess")
+        assertStaticAndRuntimeTypeIs<RandomAccess>(arrayListOf(1))
         assertTrue(listOf(1, 2) is RandomAccess, "Default read-only list implementation is RandomAccess")
         assertTrue(listOf(1) is RandomAccess, "Default singleton list is RandomAccess")
         assertTrue(emptyList<Int>() is RandomAccess, "Empty list is RandomAccess")