Merge pull request android#242 from googlesamples/grantPermissionRule

Use GrantPermissionRule in IntentsBasicSample.
dkelmer · Jan 22, 2019 · 8b41c0a · 8b41c0a
2 parents 383bcbe + 01c20d3
commit 8b41c0a
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/...androidTest/java/com/example/android/testing/espresso/BasicSample/DialerActivityTest.java b/...androidTest/java/com/example/android/testing/espresso/BasicSample/DialerActivityTest.java
@@ -50,6 +50,7 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import androidx.test.rule.GrantPermissionRule;
 import com.google.common.collect.Iterables;
 
 import org.junit.Before;
@@ -74,6 +75,8 @@ public class DialerActivityTest {
         }
     }
 
+    @Rule public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant("android.permission.CALL_PHONE");
+
     /**
      * A JUnit {@link Rule @Rule} to init and release Espresso Intents before and after each
      * test run.
@@ -95,17 +98,6 @@ public void stubAllExternalIntents() {
         intending(not(isInternal())).respondWith(new ActivityResult(Activity.RESULT_OK, null));
     }
 
-    @Before
-    public void grantPhonePermission() {
-        // In M+, trying to call a number will trigger a runtime dialog. Make sure
-        // the permission is granted before running this test.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            getInstrumentation().getUiAutomation().executeShellCommand(
-                    "pm grant " + getApplicationContext().getPackageName()
-                            + " android.permission.CALL_PHONE");
-        }
-    }
-
     @Test
     public void typeNumber_ValidInput_InitiatesCall() {
         // Types a phone number into the dialer edit text field and presses the call button.