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

Commit 1a3fc093 authored by mattsziklay's avatar mattsziklay Committed by Matt Sziklay
Browse files

Set userId on test's freeform task. 

Fixes the test by setting the userId on the test freeform task; desktop
repositories was comparing the task default of -1 to the provided default of 10, causing the isTaskInFullImmersiveState check to fail in DesktopHeaderManageWindowsMenu#addToContainer.

Bug: 381270716
Test: atest
Flag: EXEMPT bugfix
Change-Id: I81c3878e3ff66348629e6b92fcd938234b40fa1f
parent 8793e64d

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenuTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystem 
import com.google.common.truth.Truth.assertThat

import com.google.common.truth.Truth.assertThat

import org.junit.After

import org.junit.After

import org.junit.Before

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Rule

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith
@@ -77,7 +76,6 @@ class DesktopHeaderManageWindowsMenuTest : ShellTestCase() { 
    }

    }





    @Test

    @Test

    @Ignore("Test is failing internally")

    @EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP)

    @EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP)

    fun testShow_forImmersiveTask_usesSystemViewContainer() {

    fun testShow_forImmersiveTask_usesSystemViewContainer() {

        val task = createFreeformTask()

        val task = createFreeformTask()
@@ -110,6 +108,7 @@ class DesktopHeaderManageWindowsMenuTest : ShellTestCase() { 
        .setToken(MockToken().token())

        .setToken(MockToken().token())

        .setActivityType(ACTIVITY_TYPE_STANDARD)

        .setActivityType(ACTIVITY_TYPE_STANDARD)

        .setWindowingMode(WINDOWING_MODE_FREEFORM)

        .setWindowingMode(WINDOWING_MODE_FREEFORM)

        .setUserId(DEFAULT_USER_ID)

        .build()

        .build()





    private companion object {

    private companion object {