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

Commit 3b383df4 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix MotionToolLib race condition in Tests 

We must wait for the activity to become active before reading the viewRootNames from the WindowManagerGlobal

Bug: 255929005
Test: atest DdmHandleMotionToolTest, atest MotionToolManagerTest
Change-Id: I8a7932c4e234e8c3ed29bf1e518c71c165787ae8
parent 59b6ad2d

motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt

+7 −1
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ class DdmHandleMotionToolTest { 
        return MotionToolsResponse.parseFrom(wrapChunk(responseChunk).array())

    }



    private fun getActivityViewRootId() = WindowManagerGlobal.getInstance().viewRootNames.first()

    private fun getActivityViewRootId(): String {

        var activityViewRootId = ""

        activityScenarioRule.scenario.onActivity {

            activityViewRootId = WindowManagerGlobal.getInstance().viewRootNames.first()

        }

        return activityViewRootId

    }



}

motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ class MotionToolManagerTest { 


    }



    private fun getActivityViewRootId() = WindowManagerGlobal.getInstance().viewRootNames.first()



    private fun getActivityViewRootId(): String {

        var activityViewRootId = ""

        activityScenarioRule.scenario.onActivity {

            activityViewRootId = WindowManagerGlobal.getInstance().viewRootNames.first()

        }

        return activityViewRootId

    }

}