Merge "Fixes flaky tests" into tm-dev (8fbc44fb) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -44,11 +44,13 @@ public class MockMagnificationAnimationCallback extends IRemoteMagnificationAnim

		@Override
		public void onResult(boolean success) throws RemoteException {
		mCountDownLatch.countDown();
		if (success) {
		mSuccessCount.getAndIncrement();
		} else {
		mFailedCount.getAndIncrement();
		}
		// It should be put at the last line to avoid making CountDownLatch#await passed without
		// updating values.
		mCountDownLatch.countDown();
		}
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ import com.android.systemui.utils.os.FakeHandler;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Answers;
		@@ -319,7 +318,6 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
		verify(mSfVsyncFrameProvider, atLeastOnce()).postFrameCallback(any());
		}

		@Ignore("b/224717753")
		@Test
		public void moveWindowMagnifierToPositionWithAnimation_expectedValuesAndInvokeCallback()
		throws InterruptedException {
		@@ -354,7 +352,6 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
		assertEquals(mWindowMagnificationController.getCenterY(), targetCenterY, 0);
		}

		@Ignore("b/224717753")
		@Test
		public void moveWindowMagnifierToPositionMultipleTimes_expectedValuesAndInvokeCallback()
		throws InterruptedException {