Merge pull request #381 from marcodb97/deprecations_intents_advanced_sample_test

Fixed deprecations in IntentsAdvancedSample tests

Author: adazh

ui/espresso/IntentsAdvancedSample/app/src/androidTest/java/com/example/android/testing/espresso/intents/AdvancedSample/ImageViewHasDrawableMatcher.java

@@ -16,26 +16,27 @@
 
 package com.example.android.testing.espresso.intents.AdvancedSample;
 
-import androidx.test.espresso.matcher.BoundedMatcher;
+import androidx.test.espresso.matcher.BoundedDiagnosingMatcher;
 import android.view.View;
 import android.widget.ImageView;
 
 import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 
 /**
  * A Matcher for Espresso that checks if an ImageView has a drawable applied to it.
  */
 public class ImageViewHasDrawableMatcher {
 
-    public static BoundedMatcher<View, ImageView> hasDrawable() {
-        return new BoundedMatcher<View, ImageView>(ImageView.class) {
+    public static Matcher<View> hasDrawable() {
+        return new BoundedDiagnosingMatcher<View, ImageView>(ImageView.class) {
             @Override
-            public void describeTo(Description description) {
+            protected void describeMoreTo(Description description) {
                 description.appendText("has drawable");
             }
 
             @Override
-            public boolean matchesSafely(ImageView imageView) {
+            protected boolean matchesSafely(ImageView imageView, Description mismatchDescription) {
                 return imageView.getDrawable() != null;
             }
         };

ui/espresso/IntentsAdvancedSample/app/src/androidTest/java/com/example/android/testing/espresso/intents/AdvancedSample/ImageViewerActivityTest.java

@@ -21,10 +21,14 @@
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import androidx.test.espresso.intent.rule.IntentsTestRule;
+
+import androidx.test.espresso.intent.Intents;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -48,27 +52,30 @@
 public class ImageViewerActivityTest {
 
     /**
-     * A JUnit {@link Rule @Rule} to init and release Espresso Intents before and after each
-     * test run.
-     * <p>
-     * Rules are interceptors which are executed for each test method and will run before
-     * any of your setup code in the {@link Before @Before} method.
-     * <p>
-     * This rule is based on {@link ActivityTestRule} and will create and launch of the activity
-     * for you and also expose the activity under test.
+     * Use {@link ActivityScenarioRule} to create and launch the activity under test, and close it
+     * after test completes. This is a replacement for {@link androidx.test.rule.ActivityTestRule}.
      */
     @Rule
-    public IntentsTestRule<ImageViewerActivity> mIntentsRule = new IntentsTestRule<>(
+    public ActivityScenarioRule<ImageViewerActivity> mActivityScenarioRule = new ActivityScenarioRule<>(
             ImageViewerActivity.class);
 
     @Before
     public void stubCameraIntent() {
+        // Initializes Intents and begins recording intents.
+        Intents.init();
+
         ActivityResult result = createImageCaptureActivityResultStub();
 
         // Stub the Intent.
         intending(hasAction(MediaStore.ACTION_IMAGE_CAPTURE)).respondWith(result);
     }
 
+    @After
+    public void tearDown() {
+        // Clears Intents state.
+        Intents.release();
+    }
+
     @Test
     public void takePhoto_drawableIsApplied() {
         // Check that the ImageView doesn't have a drawable applied.
@@ -85,7 +92,8 @@ private ActivityResult createImageCaptureActivityResultStub() {
         // Put the drawable in a bundle.
         Bundle bundle = new Bundle();
         bundle.putParcelable(ImageViewerActivity.KEY_IMAGE_DATA, BitmapFactory.decodeResource(
-                mIntentsRule.getActivity().getResources(), R.drawable.ic_launcher));
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getResources(),
+                R.drawable.ic_launcher));
 
         // Create the Intent that will include the bundle.
         Intent resultData = new Intent();