aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improving tests to fix testBindNormalWidget_withoutConfig, and beyond

Browse Source 
1. Make waitXXX methods fail if the condition diesn’t turn true.
2. Waiting for loading to complete in tearDown instead of reloading the
 model
3. Avoiding waiting for load-complete where loading didn’t start
4. Disabling last test in AddConfigWidgetTest
5. Waiting for loading to complete inside setupAndVerifyContents(), not
 outside
6. Unifying how we wait for loader to complete
7. Adding more logging

Bug: 117332845
Test: running all Nexus tests
Change-Id: I3070e1ac2b9161179cc3e0800b0cd8162807389a
This commit is contained in:
Vadim Tryshev
2018-10-09 18:46:45 -07:00
parent 02e900c3c9
commit 14c6c8cee4
10 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/src/com/android/launcher3/util/Wait.java
View File

@@ -2,6 +2,8 @@ package com.android.launcher3.util;
import android.os.SystemClock;
import org.junit.Assert;
/**
* A utility class for waiting for a condition to be true.
*/
@@ -9,16 +11,16 @@ public class Wait {
private static final long DEFAULT_SLEEP_MS = 200;
public static boolean atMost(Condition condition, long timeout) {
return atMost(condition, timeout, DEFAULT_SLEEP_MS);
public static void atMost(String message, Condition condition, long timeout) {
atMost(message, condition, timeout, DEFAULT_SLEEP_MS);
}
public static boolean atMost(Condition condition, long timeout, long sleepMillis) {
public static void atMost(String message, Condition condition, long timeout, long sleepMillis) {
long endTime = SystemClock.uptimeMillis() + timeout;
while (SystemClock.uptimeMillis() < endTime) {
try {
if (condition.isTrue()) {
return true;
return;
}
} catch (Throwable t) {
// Ignore
@@ -29,11 +31,11 @@ public class Wait {
// Check once more before returning false.
try {
if (condition.isTrue()) {
return true;
return;
}
} catch (Throwable t) {
// Ignore
}
return false;
Assert.fail(message);
}
}