Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes flaky tests" into tm-dev

Browse Source
This commit is contained in:
Daniel Hsieh
2022-04-20 02:46:33 +00:00
committed by Android (Google) Code Review
parent f0af066196 dfff81e489
commit 8fbc44fb78
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}

3
packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
View File

@@ -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 {