diff options
author | Vadim Tryshev <vadimt@google.com> | 2018-10-05 20:03:57 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2018-10-05 20:05:34 -0700 |
commit | a7da86e14abc2bed4edf77b426179e32935dcc8d (patch) | |
tree | 5594a3e9443667f88efc85ee1f26f6322c40f6d5 /tests | |
parent | 51146bc7e66a41685a8be7796d34948f065436c4 (diff) | |
download | android_packages_apps_Trebuchet-a7da86e14abc2bed4edf77b426179e32935dcc8d.tar.gz android_packages_apps_Trebuchet-a7da86e14abc2bed4edf77b426179e32935dcc8d.tar.bz2 android_packages_apps_Trebuchet-a7da86e14abc2bed4edf77b426179e32935dcc8d.zip |
More temporary logging to diagnose testPendingWidget_autoRestored
And waiting to loader to finish to improve determinism.
Bug: 117332845
Test: running Launcher
Change-Id: Icdfce969b61f8ceb952a2715037783458da4d4c4
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 12 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index f820ff982..00df4e76d 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -298,6 +298,11 @@ public abstract class AbstractLauncherUiTest { } protected void resetLoaderState() { + if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS + && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { + android.util.Log.d("b/117332845", + "START " + android.util.Log.getStackTraceString(new Throwable())); + } try { mMainThreadExecutor.execute(new Runnable() { @Override @@ -308,6 +313,13 @@ public abstract class AbstractLauncherUiTest { } catch (Throwable t) { throw new IllegalArgumentException(t); } + waitForLauncherCondition(launcher -> + LauncherAppState.getInstance(mTargetContext).getModel().isModelLoaded()); + if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS + && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { + android.util.Log.d("b/117332845", + "FINISH " + android.util.Log.getStackTraceString(new Throwable())); + } } /** diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index a00b03564..c1dc43bf8 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -84,6 +84,11 @@ public class BindWidgetTest extends AbstractLauncherUiTest { @Override @Before public void setUp() throws Exception { + if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS + && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { + android.util.Log.d("b/117332845", + android.util.Log.getStackTraceString(new Throwable())); + } super.setUp(); mResolver = mTargetContext.getContentResolver(); @@ -105,6 +110,11 @@ public class BindWidgetTest extends AbstractLauncherUiTest { } super.tearDown(); + if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS + && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { + android.util.Log.d("b/117332845", + android.util.Log.getStackTraceString(new Throwable())); + } } @Test |