Merge "Merge "Fix AutoTileManagerTest" into pi-dev am: c7a25dc939" into pi-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2018-03-10 00:36:02 +00:00
committed by Android (Google) Code Review

View File

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import android.os.Handler;
import android.support.test.filters.SmallTest;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -27,12 +28,14 @@ import com.android.internal.app.ColorDisplayController;
import com.android.systemui.Dependency;
import com.android.systemui.Prefs;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.qs.AutoAddTracker;
import com.android.systemui.qs.QSTileHost;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidTestingRunner.class)
@RunWithLooper
@@ -40,16 +43,15 @@ import org.mockito.Mockito;
public class AutoTileManagerTest extends SysuiTestCase {
@Mock private QSTileHost mQsTileHost;
@Mock private AutoAddTracker mAutoAddTracker;
private AutoTileManager mAutoTileManager;
@Before
public void setUp() throws Exception {
mDependency.injectTestDependency(Dependency.BG_LOOPER,
TestableLooper.get(this).getLooper());
Prefs.putBoolean(mContext, Prefs.Key.QS_NIGHTDISPLAY_ADDED, false);
mQsTileHost = Mockito.mock(QSTileHost.class);
mAutoTileManager = new AutoTileManager(mContext, mQsTileHost);
MockitoAnnotations.initMocks(this);
mAutoTileManager = new AutoTileManager(mContext, mAutoAddTracker, mQsTileHost,
new Handler(TestableLooper.get(this).getLooper()));
}
@Test