commit 5f66384c4b5b90b642edc1be1d2f1eee2b705030
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 19 21:36:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 21:36:30 2020 +0000
tree fbe7d29455812fd95315d74ec005569a6b4cc0c1
parent 6544cd038253f517ae1342ef73e1b86455a66736
parent b4d5d519869a0d8b5a4d1738dda2e82278d34b68

Merge "Improved TestSystemIntents to show all missing intents in case of failure." into rvc-dev

tests/tests/systemintents/src/android/systemintents/cts/TestSystemIntents.java

diff --git a/tests/tests/systemintents/src/android/systemintents/cts/TestSystemIntents.java b/tests/tests/systemintents/src/android/systemintents/cts/TestSystemIntents.java
index fe35f73..f31dcf1 100644
--- a/tests/tests/systemintents/src/android/systemintents/cts/TestSystemIntents.java
+++ b/tests/tests/systemintents/src/android/systemintents/cts/TestSystemIntents.java
@@ -30,7 +30,10 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.google.common.truth.Expect;
+
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -52,6 +55,8 @@
         }
     }
 
+    @Rule public final Expect mExpect = Expect.create();
+
     private Context mContext;
     private PackageManager mPackageManager;
 
@@ -114,7 +119,8 @@
             if ((productFlags & e.flags) == 0) {
                 final ResolveInfo ri = mPackageManager.resolveActivity(e.intent,
                         PackageManager.MATCH_DEFAULT_ONLY);
-                assertTrue("API intent " + e.intent + " not implemented by any activity", ri != null);
+                mExpect.withMessage("API intent %s not implemented by any activity", e.intent)
+                        .that(ri).isNotNull();
             }
         }
     }