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

Commit 502df199 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix VirtualDisplayAdapterTest flakiness" into main

parents 67d43409 d8f66df8
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyFloat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

@@ -73,6 +74,8 @@ public class VirtualDisplayAdapterTest {
    private static final float DEFAULT_BRIGHTNESS = 0.34f;
    private static final float DIM_BRIGHTNESS = 0.12f;

    private static final int CALLBACK_TIMEOUT_MILLIS = 3000;

    @Rule
    public final TestableContext mContext = new TestableContext(
            InstrumentationRegistry.getInstrumentation().getContext());
@@ -437,7 +440,7 @@ public class VirtualDisplayAdapterTest {
        stateOnRunnable.run();
        verify(mMockSufaceControlDisplayFactory)
                .setDisplayPowerMode(displayToken, SurfaceControl.POWER_MODE_NORMAL);
        verify(mMockCallback).onResumed();
        verify(mMockCallback, timeout(CALLBACK_TIMEOUT_MILLIS)).onResumed();

        // Requesting the same display state is a no-op
        Runnable stateOnSecondRunnable = device.requestDisplayStateLocked(
@@ -453,7 +456,7 @@ public class VirtualDisplayAdapterTest {
        stateOffRunnable.run();
        verify(mMockSufaceControlDisplayFactory)
                .setDisplayPowerMode(displayToken, SurfaceControl.POWER_MODE_OFF);
        verify(mMockCallback).onPaused();
        verify(mMockCallback, timeout(CALLBACK_TIMEOUT_MILLIS)).onPaused();
    }

    @EnableFlags(