Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport shortcut manager test utilities to DR

Browse Source 
Bug 29612099
Bug 31033599

Change-Id: I59d4ae61fdb2245797f2d8e39beddc3b66b93fe6
This commit is contained in:
Makoto Onuki
2016-08-24 14:38:23 -07:00
parent e9c519e049
commit 0a15cd4ba0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/shortcutmanagerutils/Android.mk
View File

@@ -26,6 +26,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := ShortcutManagerTestUtils LOCAL_MODULE := ShortcutManagerTestUtils
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := test_current
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)

17
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
View File

@@ -156,10 +156,10 @@ public class ShortcutManagerTestUtils {
return result; return result;
} }
private static List<String> runCommand(Instrumentation instrumentation, String command) { public static List<String> runCommand(Instrumentation instrumentation, String command) {
return runCommand(instrumentation, command, null); return runCommand(instrumentation, command, null);
} }
private static List<String> runCommand(Instrumentation instrumentation, String command, public static List<String> runCommand(Instrumentation instrumentation, String command,
Predicate<List<String>> resultAsserter) { Predicate<List<String>> resultAsserter) {
Log.d(TAG, "Running command: " + command); Log.d(TAG, "Running command: " + command);
final List<String> result; final List<String> result;
@@ -175,11 +175,11 @@ public class ShortcutManagerTestUtils {
return result; return result;
} }
private static void runCommandForNoOutput(Instrumentation instrumentation, String command) { public static void runCommandForNoOutput(Instrumentation instrumentation, String command) {
runCommand(instrumentation, command, result -> result.size() == 0); runCommand(instrumentation, command, result -> result.size() == 0);
} }
private static List<String> runShortcutCommand(Instrumentation instrumentation, String command, public static List<String> runShortcutCommand(Instrumentation instrumentation, String command,
Predicate<List<String>> resultAsserter) { Predicate<List<String>> resultAsserter) {
return runCommand(instrumentation, "cmd shortcut " + command, resultAsserter); return runCommand(instrumentation, "cmd shortcut " + command, resultAsserter);
} }
@@ -204,7 +204,8 @@ public class ShortcutManagerTestUtils {
} }
public static void setDefaultLauncher(Instrumentation instrumentation, String component) { public static void setDefaultLauncher(Instrumentation instrumentation, String component) {
runCommand(instrumentation, "cmd package set-home-activity " + component, runCommand(instrumentation, "cmd package set-home-activity --user "
+ instrumentation.getContext().getUserId() + " " + component,
result -> result.contains("Success")); result -> result.contains("Success"));
} }
@@ -1053,7 +1054,11 @@ public class ShortcutManagerTestUtils {
} }
public static void retryUntil(BooleanSupplier checker, String message) { public static void retryUntil(BooleanSupplier checker, String message) {
final long timeOut = System.currentTimeMillis() + 30 * 1000; // wait for 30 seconds. retryUntil(checker, message, 30);
}
public static void retryUntil(BooleanSupplier checker, String message, long timeoutSeconds) {
final long timeOut = System.currentTimeMillis() + timeoutSeconds * 1000;
while (!checker.getAsBoolean()) { while (!checker.getAsBoolean()) {
if (System.currentTimeMillis() > timeOut) { if (System.currentTimeMillis() > timeOut) {
break; break;