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

Commit c683640f authored by Vishnu Nair's avatar Vishnu Nair
Browse files

WM: Promote TaskPositioningControllerTests and ZOrderingTests to non-flaky 

They have been running without errors in postsubmit. go/wm-tests.

Fixes:127948929
Test: wm presubmit tests & go/wm-tests monitoring
Change-Id: Id5dea500ef421920224cc23c5b179664fa202349
parent 7c8b1541

services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue; 
import android.platform.test.annotations.Presubmit;

import android.view.InputChannel;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.Before;
@@ -89,7 +88,6 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 
        assertNull(mTarget.getDragWindowHandleLocked());

    }



    @FlakyTest(bugId = 69229402)

    @Test

    public void testHandleTapOutsideTask() {

        synchronized (mWm.mGlobalLock) {

services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java

+0 −9
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.platform.test.annotations.Presubmit; 
import android.view.SurfaceControl;

import android.view.SurfaceSession;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.After;
@@ -212,7 +211,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        return createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, name);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForImeWithNoTarget() {

        mDisplayContent.mInputMethodTarget = null;
@@ -230,7 +228,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForImeWithAppTarget() {

        final WindowState imeAppTarget = createWindow("imeAppTarget");
@@ -250,7 +247,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForImeWithAppTargetWithChildWindows() {

        final WindowState imeAppTarget = createWindow("imeAppTarget");
@@ -277,7 +273,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() {

        final WindowState appBelowImeTarget = createWindow("appBelowImeTarget");
@@ -301,7 +296,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForImeNonAppImeTarget() {

        final WindowState imeSystemOverlayTarget = createWindow(null, TYPE_SYSTEM_OVERLAY,
@@ -329,7 +323,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testAssignWindowLayers_ForStatusBarImeTarget() {

        mDisplayContent.mInputMethodTarget = mStatusBarWindow;
@@ -344,7 +337,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testStackLayers() {

        final WindowState anyWindow1 = createWindow("anyWindow");
@@ -432,7 +424,6 @@ public class ZOrderingTests extends WindowTestsBase { 
        }

    }



    @FlakyTest(bugId = 124088319)

    @Test

    public void testDockedDividerPosition() {

        final WindowState pinnedStackWindow = createWindowOnStack(null, WINDOWING_MODE_PINNED,