Merge "Fix flaky test?" into oc-dev

This commit is contained in:
Jason Monk
2017-05-01 13:23:17 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 2 deletions

View File

@@ -32,6 +32,7 @@ import android.testing.AndroidTestingRunner;
import com.android.systemui.SysuiBaseFragmentTest;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.statusbar.policy.Clock;
import com.android.systemui.statusbar.policy.UserSwitcherController;
import android.testing.LayoutInflaterBuilder;
import android.testing.TestableLooper;
@@ -64,6 +65,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest {
FrameLayout.class)
.replace("TextClock", View.class)
.replace(CarrierText.class, View.class)
.replace(Clock.class, View.class)
.build());
mDependency.injectTestDependency(Dependency.BG_LOOPER,

View File

@@ -161,12 +161,12 @@ public abstract class BaseFragmentTest {
protected void attachFragmentToWindow() {
ViewUtils.attachView(mView);
TestableLooper.get(this).processMessages(1);
TestableLooper.get(this).processAllMessages();
}
protected void detachFragmentToWindow() {
ViewUtils.detachView(mView);
TestableLooper.get(this).processMessages(1);
TestableLooper.get(this).processAllMessages();
}
protected void destroyFragments() {