1 files changed, 10 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
index 3de8ece8c3..cc171ca905 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
@@ -1,8 +1,13 @@
 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 com.mapbox.mapboxsdk.testapp.activity.textureview.TextureViewDebugModeActivity
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.lang.Thread.sleep
@@ -13,17 +18,15 @@ import java.lang.Thread.sleep
 @RunWith(AndroidJUnit4::class)
 class TextureViewReopenTest : BaseIntegrationTest() {
 
-  @Before
-  override fun beforeTest() {
-    super.beforeTest()
-    openFeature("TextureView debug")
-  }
+  @get:Rule
+  var activityRule: ActivityTestRule<TextureViewDebugModeActivity> = ActivityTestRule(TextureViewDebugModeActivity::class.java)
 
   @Test
   @LargeTest
   fun reopenTextureViewDebugActivity() {
-    pressHomeReturnWithRecentApps()
     device.waitForIdle()
-    sleep(LAUNCH_TIMEOUT)
+    device.pressHome()
+    device.waitForIdle()
+    device.launchActivity(activityRule.activity.applicationContext, TextureViewDebugModeActivity::class.java)
   }
 }
 \ No newline at end of file