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

Commit ad3ba6b7 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Marked some WM flaky tests as such" into qt-dev 

am: fdb2425c

Change-Id: Iaedd07c98e037ce2136cf904aaaebefd8cab2b3c
parents 972a828c fdb2425c

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

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; 


import android.platform.test.annotations.Presubmit;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.Before;
@@ -80,6 +81,7 @@ public class AnimatingAppWindowTokenRegistryTest extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testContainerRemoved() {

        final AppWindowToken window1 = createAppWindowToken(mDisplayContent,

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.view.RemoteAnimationAdapter; 
import android.view.RemoteAnimationDefinition;

import android.view.RemoteAnimationTarget;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.Test;
@@ -96,6 +97,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testModeChangeRemoteAnimatorNoSnapshot() {

        // setup currently defaults to no snapshot.

        setUpOnDisplay(mDisplayContent);
@@ -113,6 +115,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testCancelPendingChangeOnRemove() {

        // setup currently defaults to no snapshot.

        setUpOnDisplay(mDisplayContent);
@@ -132,6 +135,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testNoChangeWhenMoveDisplay() {

        mDisplayContent.setWindowingMode(WINDOWING_MODE_FULLSCREEN);

        final DisplayContent dc1 = createNewDisplay(Display.STATE_ON);

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

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

import android.view.WindowManager;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.Before;
@@ -52,6 +53,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testTranslucentOpen() {

        synchronized (mWm.mGlobalLock) {

            final AppWindowToken behind = createAppWindowToken(mDisplayContent,
@@ -69,6 +71,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testTranslucentClose() {

        synchronized (mWm.mGlobalLock) {

            final AppWindowToken behind = createAppWindowToken(mDisplayContent,
@@ -84,6 +87,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testChangeIsNotOverwritten() {

        synchronized (mWm.mGlobalLock) {

            final AppWindowToken behind = createAppWindowToken(mDisplayContent,

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

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.view.Display; 
import org.junit.Before;

import org.junit.Test;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



/**
@@ -78,6 +79,7 @@ public class AppTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testForceOverride() {

        mWm.prepareAppTransition(TRANSIT_KEYGUARD_UNOCCLUDE, false /* alwaysKeepCurrent */);

        mDc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN,
@@ -93,6 +95,7 @@ public class AppTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testKeepKeyguard_withCrashing() {

        mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);

        mWm.prepareAppTransition(TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */);
@@ -100,6 +103,7 @@ public class AppTransitionTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testAppTransitionStateForMultiDisplay() {

        // Create 2 displays & presume both display the state is ON for ready to display & animate.

        final DisplayContent dc1 = createNewDisplay(Display.STATE_ON);

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.platform.test.annotations.Presubmit; 
import android.view.Surface;

import android.view.SurfaceControl;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import org.junit.Test;
@@ -53,6 +54,7 @@ public class AppWindowThumbnailTest extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testDestroy_nullsSurface() {

        final AppWindowThumbnail t = buildThumbnail();

        assertNotNull(t.getSurfaceControl());