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

Commit 4d61d526 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest... 

Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest test case fails on cf_x86_64 devices"
parents ca522f4f 82febd2b

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java

+10 −10
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.systemui.util.settings.SecureSettings; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Answers;
@@ -66,8 +65,6 @@ import java.util.concurrent.CountDownLatch; 
import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicReference;

import java.util.concurrent.atomic.AtomicReference;





// TODO(b/288926821): un-ignore once fixed

@Ignore("Needs deeper investigation/refactoring, see b/289212459 and b/289392705")

@LargeTest

@LargeTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidTestingRunner.class)

public class WindowMagnificationAnimationControllerTest extends SysuiTestCase {

public class WindowMagnificationAnimationControllerTest extends SysuiTestCase {
@@ -75,8 +72,11 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { 
    private static final float DEFAULT_SCALE = 4.0f;

    private static final float DEFAULT_SCALE = 4.0f;

    private static final float DEFAULT_CENTER_X = 400.0f;

    private static final float DEFAULT_CENTER_X = 400.0f;

    private static final float DEFAULT_CENTER_Y = 500.0f;

    private static final float DEFAULT_CENTER_Y = 500.0f;

    // The duration couldn't too short, otherwise the ValueAnimator won't work in expectation.

    // The duration and period couldn't too short, otherwise the ValueAnimator and

    private static final long ANIMATION_DURATION_MS = 300;

    //    Instrumentation.runOnMainSync won't work in expectation. (b/288926821)

    private static final long ANIMATION_DURATION_MS = 600;

    private static final long WAIT_FULL_ANIMATION_PERIOD = 1000;

    private static final long WAIT_INTERMEDIATE_ANIMATION_PERIOD = 250;





    private AtomicReference<Float> mCurrentScale = new AtomicReference<>((float) 0);

    private AtomicReference<Float> mCurrentScale = new AtomicReference<>((float) 0);

    private AtomicReference<Float> mCurrentCenterX = new AtomicReference<>((float) 0);

    private AtomicReference<Float> mCurrentCenterX = new AtomicReference<>((float) 0);
@@ -118,8 +118,8 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { 
        mWindowManager = spy(new TestableWindowManager(wm));

        mWindowManager = spy(new TestableWindowManager(wm));

        mContext.addMockSystemService(Context.WINDOW_SERVICE, mWindowManager);

        mContext.addMockSystemService(Context.WINDOW_SERVICE, mWindowManager);





        mWaitingAnimationPeriod = 2 * ANIMATION_DURATION_MS;

        mWaitingAnimationPeriod = WAIT_FULL_ANIMATION_PERIOD;

        mWaitIntermediateAnimationPeriod = ANIMATION_DURATION_MS / 2;

        mWaitIntermediateAnimationPeriod = WAIT_INTERMEDIATE_ANIMATION_PERIOD;

        mWindowMagnificationAnimationController = new WindowMagnificationAnimationController(

        mWindowMagnificationAnimationController = new WindowMagnificationAnimationController(

                mContext, newValueAnimator());

                mContext, newValueAnimator());

        mController = new SpyWindowMagnificationController(mContext, mHandler,

        mController = new SpyWindowMagnificationController(mContext, mHandler,
@@ -749,7 +749,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    public void moveWindowMagnifier_enabled_vertical_only_expectedValue() {

    public void moveWindowMagnifierWithYXRatioLargerThanBase_enabled_movedOnlyVertically() {

        enableWindowMagnificationWithoutAnimation();

        enableWindowMagnificationWithoutAnimation();





        // should move vertically since offsetY/offsetX > HORIZONTAL_LOCK_BASE

        // should move vertically since offsetY/offsetX > HORIZONTAL_LOCK_BASE
@@ -765,7 +765,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    public void moveWindowMagnifier_enabled_horinzontal_only_expectedValue() {

    public void moveWindowMagnifierWithYXRatioLessThanBase_enabled_movedOnlyHorizontally() {

        enableWindowMagnificationWithoutAnimation();

        enableWindowMagnificationWithoutAnimation();





        // should move vertically since offsetY/offsetX <= HORIZONTAL_LOCK_BASE

        // should move vertically since offsetY/offsetX <= HORIZONTAL_LOCK_BASE
@@ -781,7 +781,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    public void moveWindowMagnifier_enabled_setDiagonalEnabled_expectedValues() {

    public void moveWindowMagnifier_magnifierEnabledAndDiagonalEnabled_movedDiagonally() {

        enableWindowMagnificationWithoutAnimation();

        enableWindowMagnificationWithoutAnimation();





        final float offsetX = 50.0f;

        final float offsetX = 50.0f;