| commit | ce6acecd5e696724b9f018851bed318404729f37 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Fri Jun 04 19:33:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 04 19:33:00 2021 +0000 |
| tree | f5971a9a5fa57b1e628d4bb3f5ee8e53845477f6 | |
| parent | 8dc741bf74d4288e6375a328852823c21b229817 [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: I4c638b2ffb8ee2d01d7157e87fbe5e0feeca48b3
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 {