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

Commit 340bb42b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Promote passing WM unit tests to presubmit" into udc-dev am: fb8e8944 am: 61a79521 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22849786



Change-Id: I7d8a14af088e41ddf717df5e43ecd4fb7f6d0b12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34c838d0 61a79521

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

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

import android.view.Display;

import android.view.View;

import android.view.View;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.MediumTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.rule.ActivityTestRule;

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 176134235)

    public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {

    public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {

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

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

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

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

import android.util.Log;

import android.view.IWindowManager;

import android.view.IWindowManager;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.MediumTest;





import com.android.server.am.AssistDataRequester;

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 130388718)

    public void testRequestData() throws Exception {

    public void testRequestData() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                CALLER_ASSIST_SCREENSHOT_ALLOWED);

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 130388718)

    public void testNoFetchScreenshots_expectNoScreenshotCallbacks() throws Exception {

    public void testNoFetchScreenshots_expectNoScreenshotCallbacks() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                CALLER_ASSIST_SCREENSHOT_ALLOWED);

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 130388718)

    public void testDisallowAssistScreenshot_expectNullScreenshotCallback() throws Exception {

    public void testDisallowAssistScreenshot_expectNullScreenshotCallback() throws Exception {

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

        setupMocks(CURRENT_ACTIVITY_ASSIST_ALLOWED, CALLER_ASSIST_STRUCTURE_ALLOWED,

                !CALLER_ASSIST_SCREENSHOT_ALLOWED);

                !CALLER_ASSIST_SCREENSHOT_ALLOWED);

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

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

import android.os.SystemClock;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.MediumTest;





import org.junit.After;

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 131005232)

    public void testProcessOneItem_Flush() throws Exception {

    public void testProcessOneItem_Flush() throws Exception {

        mFactory.setExpectedProcessedItemNumber(1);

        mFactory.setExpectedProcessedItemNumber(1);

        mListener.setExpectedOnPreProcessItemCallbackTimes(1);

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

    }





    @Test

    @Test

    @FlakyTest(bugId = 128526085)

    public void testProcessTwoItems_OneAfterAnother() throws Exception {

    public void testProcessTwoItems_OneAfterAnother() throws Exception {

        // First item

        // First item

        mFactory.setExpectedProcessedItemNumber(1);

        mFactory.setExpectedProcessedItemNumber(1);

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

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

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManager.LayoutParams;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.server.wm.RefreshRatePolicy.FrameRateVote;

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

@SmallTest

@Presubmit

@Presubmit

@RunWith(WindowTestRunner.class)

@RunWith(WindowTestRunner.class)

@FlakyTest

public class RefreshRatePolicyTest extends WindowTestsBase {

public class RefreshRatePolicyTest extends WindowTestsBase {

    private static final int HI_MODE_ID = 1;

    private static final int HI_MODE_ID = 1;

    private static final float HI_REFRESH_RATE = 90;

    private static final float HI_REFRESH_RATE = 90;

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

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

        mFinishCallbackLatch.countDown();

    }

    }





    @FlakyTest(bugId = 144611135)

    @Test

    @Test

    public void testAnimation() throws Exception {

    public void testAnimation() throws Exception {

        mSurfaceAnimationRunner

        mSurfaceAnimationRunner