summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-08-01 00:36:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-01 00:36:31 +0000
commitd33894c7712a5c2cf0d93fa311eb3c4834ed516a (patch)
treee5cf3c8f9f3aa730837c60972a6f80b93ff08c72 /tests
parent70f539cd45f940ffda90f5d56a174376e10e2192 (diff)
parentb90e363b2295645dd36e7f57fb57069ee3e05884 (diff)
downloadandroid_packages_apps_Trebuchet-d33894c7712a5c2cf0d93fa311eb3c4834ed516a.tar.gz
android_packages_apps_Trebuchet-d33894c7712a5c2cf0d93fa311eb3c4834ed516a.tar.bz2
android_packages_apps_Trebuchet-d33894c7712a5c2cf0d93fa311eb3c4834ed516a.zip
Merge "More tracing for wellbeing tests" into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/util/Wait.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/src/com/android/launcher3/util/Wait.java b/tests/src/com/android/launcher3/util/Wait.java
index 593cce832..899686bd6 100644
--- a/tests/src/com/android/launcher3/util/Wait.java
+++ b/tests/src/com/android/launcher3/util/Wait.java
@@ -1,6 +1,7 @@
package com.android.launcher3.util;
import android.os.SystemClock;
+import android.util.Log;
import org.junit.Assert;
@@ -16,7 +17,9 @@ public class Wait {
}
public static void atMost(String message, Condition condition, long timeout, long sleepMillis) {
- long endTime = SystemClock.uptimeMillis() + timeout;
+ final long startTime = SystemClock.uptimeMillis();
+ long endTime = startTime + timeout;
+ Log.d("Wait", "atMost: " + startTime + " - " + endTime);
while (SystemClock.uptimeMillis() < endTime) {
try {
if (condition.isTrue()) {
@@ -36,6 +39,7 @@ public class Wait {
} catch (Throwable t) {
throw new RuntimeException(t);
}
+ Log.d("Wait", "atMost: timed out: " + SystemClock.uptimeMillis());
Assert.fail(message);
}
}