[android] - revert onDismiss workaround, refactor tests, adress review

comments

1 files changed, 9 insertions, 8 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
index 95f05566c3..945fac677e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
@@ -1,8 +1,12 @@
 package com.mapbox.mapboxsdk.integration
 
 import android.support.test.filters.LargeTest
+import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
+import com.mapbox.mapboxsdk.testapp.activity.maplayout.GLSurfaceRecyclerViewActivity
+import com.mapbox.mapboxsdk.testapp.activity.maplayout.SimpleMapActivity
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -12,19 +16,16 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class GLSurfaceViewReuseTest : BaseIntegrationTest() {
 
-  @Before
-  override fun beforeTest() {
-    super.beforeTest()
-    openFeature("RecyclerView GLSurfaceView")
-  }
+  @get:Rule
+  var activityRule: ActivityTestRule<GLSurfaceRecyclerViewActivity> = ActivityTestRule(GLSurfaceRecyclerViewActivity::class.java)
 
   @Test
   @LargeTest
-  fun scrollRecylerView() {
+  fun scrollRecyclerView() {
     device.waitForIdle()
-    scrollRecyclerViewTo("Twenty-one")
+    device.scrollRecyclerViewTo("Twenty-one")
     device.waitForIdle()
-    scrollRecyclerViewTo("One")
+    device.scrollRecyclerViewTo("One")
     device.waitForIdle()
   }
 }
\ No newline at end of file