| commit | 301ffa65023d2f24cd276d41e73c865a87190b30 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Fri Jun 04 19:34:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 04 19:34:41 2021 +0000 |
| tree | d824c55a20d1aa9a633804172b3951aa6b84329c | |
| parent | 75987bddd3495413275086d0f2a35525d20e2275 [diff] | |
| parent | 1ba5a68e31f9c0666857002a76bdd191a0c72a38 [diff] |
Merge "Improve diagnostics when cannot install wellbeing test apk" into sc-dev am: 1ba5a68e31 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14682231 Change-Id: I290b71eecddc1890178ce029ac06a488341789f4
diff --git a/tests/src/com/android/launcher3/util/TestUtil.java b/tests/src/com/android/launcher3/util/TestUtil.java index 55e5744..67f3902 100644 --- a/tests/src/com/android/launcher3/util/TestUtil.java +++ b/tests/src/com/android/launcher3/util/TestUtil.java
@@ -22,6 +22,8 @@ import androidx.test.uiautomator.UiDevice; +import org.junit.Assert; + import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -48,7 +50,10 @@ in.close(); out.close(); - UiDevice.getInstance(getInstrumentation()).executeShellCommand("pm install " + apkFilename); + final String result = UiDevice.getInstance(getInstrumentation()) + .executeShellCommand("pm install " + apkFilename); + Assert.assertTrue("Failed to install wellbeing test apk; make sure the device is rooted", + "Success".equals(result.replaceAll("\\s+", ""))); } public static void uninstallDummyApp() throws IOException {