Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7da86e1 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

More temporary logging to diagnose testPendingWidget_autoRestored 

And waiting to loader to finish to improve determinism.

Bug: 117332845
Test: running Launcher
Change-Id: Icdfce969b61f8ceb952a2715037783458da4d4c4
parent 51146bc7

src/com/android/launcher3/LauncherModel.java

+5 −0
Original line number Diff line number Diff line
@@ -563,6 +563,11 @@ public class LauncherModel extends BroadcastReceiver 
            synchronized (mLock) {

                // Everything loaded bind the data.

                mModelLoaded = true;

                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()));

                }

            }

        }

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+12 −0
Original line number Diff line number Diff line
@@ -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()));

        }

    }



    /**

tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java

+10 −0
Original line number Diff line number Diff line
@@ -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