Merge pull request #78 from AppDevNext/DeprecationEspresso

Fix deprecation in Espresso

Author: hannesa2

sample/src/androidTest/java/info/hannes/logcat/AllFragmentsTest.kt

@@ -1,14 +1,13 @@
 package info.hannes.logcat
 
 import android.Manifest
-import android.view.View
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.Suppress
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.moka.utils.Screenshot
 import org.hamcrest.Matchers.allOf
@@ -21,7 +20,7 @@ import org.junit.runner.RunWith
 class AllFragmentsTest {
 
     @get:Rule
-    var mActivityTestRule = ActivityTestRule(BothLogActivity::class.java)
+    var mActivityTestRule = ActivityScenarioRule(BothLogActivity::class.java)
 
     @get:Rule
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
@@ -31,7 +30,7 @@ class AllFragmentsTest {
     @Test
     @Suppress
     fun basicTest() {
-        onView(allOf<View>(withContentDescription("All log"),
+        onView(allOf(withContentDescription("All log"),
                 withParent(withId(R.id.action_bar)),
                 isDisplayed()))
 

sample/src/androidTest/java/info/hannes/logcat/LogcatTest.kt

@@ -1,14 +1,13 @@
 package info.hannes.logcat
 
 import android.Manifest
-import android.view.View
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.Suppress
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.moka.utils.Screenshot
 import org.hamcrest.Matchers.allOf
@@ -21,7 +20,7 @@ import org.junit.runner.RunWith
 class LogcatTest {
 
     @get:Rule
-    var mActivityTestRule = ActivityTestRule(LogcatActivity::class.java)
+    var mActivityTestRule = ActivityScenarioRule(LogcatActivity::class.java)
 
     @get:Rule
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
@@ -31,7 +30,7 @@ class LogcatTest {
     @Test
     @Suppress
     fun basicTest() {
-        onView(allOf<View>(withContentDescription("Logcat"),
+        onView(allOf(withContentDescription("Logcat"),
                 withParent(withId(R.id.action_bar)),
                 isDisplayed()))
 

sample/src/androidTest/java/info/hannes/logcat/MainActivityTest.kt

@@ -1,14 +1,13 @@
 package info.hannes.logcat
 
 import android.Manifest
-import android.view.View
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.moka.utils.Screenshot
 import org.hamcrest.Matchers.allOf
@@ -23,7 +22,7 @@ import org.junit.runner.RunWith
 class MainActivityTest {
 
     @get:Rule
-    val mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+    val mActivityTestRule = ActivityScenarioRule(MainActivity::class.java)
 
     @get:Rule
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
@@ -32,7 +31,7 @@ class MainActivityTest {
 
     @Before
     fun openDrawer() {
-        val navMain = onView(allOf<View>(withContentDescription("Navigate up"), isDisplayed()))
+        val navMain = onView(allOf(withContentDescription("Navigate up"), isDisplayed()))
         navMain.perform(click())
         Screenshot.takeScreenshot("End")
     }