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

Commit 993e9519 authored by Charles Chen's avatar Charles Chen
Browse files

Fix focusChanges assertion 

The assertion verifies the focus changes starting from the transition.
Passing the subsequence of focus changes makes the assertion fail.
This CL passes all windows which involve focus changes to make the
assertion pass.

Fixes: 428630722
Test: EnterBubbleViaDragToBubbleBarTest
Flag: TEST_ONLY
Change-Id: Icfa2800c7dba1344a0e7dc0190b9a3768a0434ce
parent 0d5adbee

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/EnterBubbleViaDragToBubbleBarTest.kt

+10 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.flicker.bubbles 
import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.NavBar

import android.tools.traces.component.ComponentNameMatcher.Companion.LAUNCHER

import android.tools.traces.component.ComponentNameMatcher.Companion.TASK_BAR

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -101,6 +102,14 @@ class EnterBubbleViaDragToBubbleBarTest(navBar: NavBar) : BubbleFlickerTestBase( 
    @FlakyTest(bugId = 428630722)

    @Test

    override fun focusChanges() {

        eventLogSubject.focusChanges(TASK_BAR.toWindowName(), testApp.toWindowName())

        eventLogSubject.focusChanges(

            LAUNCHER.toWindowName(),

            // Tap on the task bar.

            TASK_BAR.toWindowName(),

            // Drag an icon from task bar to the bubble bar location.

            LAUNCHER.toWindowName(),

            // The bubble app launches.

            testApp.toWindowName()

        )

    }

}
 
 No newline at end of file