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

Commit 6c7d52d5 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Promote passing WM unit tests to presubmit 

Tests were deflaked and can be moved back to presubmit

Bug: 144611135
Bug: 150409355
Bug: 131005232
Bug: 130388718
Bug: 176134235
Bug: 128526085
Bug: 131005232

Test: atest ActivityThreadTest AssistDataRequesterTest PersisterQueueTests RefreshRatePolicyTest SurfaceAnimationRunnerTest TaskStackChangedListenerTest WindowContainerThumbnailTest

Change-Id: I88e743737ed514be2da0360b39e4d66d3a3b48f1
parent 5e486046

core/tests/coretests/src/android/app/activity/ActivityThreadTest.java

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.util.MergedConfiguration; 
import android.view.Display;

import android.view.View;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.rule.ActivityTestRule;
@@ -616,7 +615,6 @@ public class ActivityThreadTest { 
    }



    @Test

    @FlakyTest(bugId = 176134235)

    public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {

        final TestActivity activity = mActivityTestRule.launchActivity(new Intent());

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

+0 −4
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.platform.test.annotations.Presubmit; 
import android.util.Log;

import android.view.IWindowManager;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;



import com.android.server.am.AssistDataRequester;
@@ -155,7 +154,6 @@ public class AssistDataRequesterTest { 
    }



    @Test

    @FlakyTest(bugId = 130388718)

    public void testRequestData() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                CALLER_ASSIST_SCREENSHOT_ALLOWED);
@@ -263,7 +261,6 @@ public class AssistDataRequesterTest { 
    }



    @Test

    @FlakyTest(bugId = 130388718)

    public void testNoFetchScreenshots_expectNoScreenshotCallbacks() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                CALLER_ASSIST_SCREENSHOT_ALLOWED);
@@ -275,7 +272,6 @@ public class AssistDataRequesterTest { 
    }



    @Test

    @FlakyTest(bugId = 130388718)

    public void testDisallowAssistScreenshot_expectNullScreenshotCallback() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                !CALLER_ASSIST_SCREENSHOT_ALLOWED);

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

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

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;



import org.junit.After;
@@ -110,7 +109,6 @@ public class PersisterQueueTests { 
    }



    @Test

    @FlakyTest(bugId = 131005232)

    public void testProcessOneItem_Flush() throws Exception {

        mFactory.setExpectedProcessedItemNumber(1);

        mListener.setExpectedOnPreProcessItemCallbackTimes(1);
@@ -162,7 +160,6 @@ public class PersisterQueueTests { 
    }



    @Test

    @FlakyTest(bugId = 128526085)

    public void testProcessTwoItems_OneAfterAnother() throws Exception {

        // First item

        mFactory.setExpectedProcessedItemNumber(1);

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

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.view.Surface; 
import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import com.android.server.wm.RefreshRatePolicy.FrameRateVote;
@@ -53,7 +52,6 @@ import org.junit.runner.RunWith; 
@SmallTest

@Presubmit

@RunWith(WindowTestRunner.class)

@FlakyTest

public class RefreshRatePolicyTest extends WindowTestsBase {

    private static final int HI_MODE_ID = 1;

    private static final float HI_REFRESH_RATE = 90;

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

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ public class SurfaceAnimationRunnerTest { 
        mFinishCallbackLatch.countDown();

    }



    @FlakyTest(bugId = 144611135)

    @Test

    public void testAnimation() throws Exception {

        mSurfaceAnimationRunner