Merge "[Settings] Fix flaky presubmit failure" into tm-dev

This commit is contained in:
Bonian Chen
2022-04-27 16:23:09 +00:00
committed by Android (Google) Code Review

View File

@@ -43,6 +43,9 @@ public class LifecycleCallbackConverterTest implements LifecycleOwner {
public void setUp() { public void setUp() {
mTestData = new Object(); mTestData = new Object();
mConsumer = new TestConsumer(); mConsumer = new TestConsumer();
}
private void initEnvPerTestCase() {
mConverter = new LifecycleCallbackConverter<Object>(getLifecycle(), mConsumer); mConverter = new LifecycleCallbackConverter<Object>(getLifecycle(), mConsumer);
} }
@@ -52,6 +55,7 @@ public class LifecycleCallbackConverterTest implements LifecycleOwner {
@Test @Test
public void converter_dropResult_whenInActive() { public void converter_dropResult_whenInActive() {
initEnvPerTestCase();
mConverter.postResult(mTestData); mConverter.postResult(mTestData);
assertThat(mConsumer.getCallbackCount()).isEqualTo(0); assertThat(mConsumer.getCallbackCount()).isEqualTo(0);
@@ -59,6 +63,7 @@ public class LifecycleCallbackConverterTest implements LifecycleOwner {
@Test @Test
public void converter_callbackResult_whenActive() { public void converter_callbackResult_whenActive() {
initEnvPerTestCase();
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
@@ -69,6 +74,7 @@ public class LifecycleCallbackConverterTest implements LifecycleOwner {
@Test @Test
public void converter_dropResult_whenBackToInActive() { public void converter_dropResult_whenBackToInActive() {
initEnvPerTestCase();
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
@@ -79,6 +85,7 @@ public class LifecycleCallbackConverterTest implements LifecycleOwner {
@Test @Test
public void converter_passResultToUiThread_whenActive() { public void converter_passResultToUiThread_whenActive() {
initEnvPerTestCase();
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START); mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);