Merge "Fix test"
This commit is contained in:
committed by
Android (Google) Code Review
commit
347829525c
@@ -19,6 +19,7 @@ package com.android.settings.development.qstile;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.atLeastOnce;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
@@ -40,7 +41,6 @@ import com.android.internal.statusbar.IStatusBarService;
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
@@ -52,6 +52,8 @@ import org.robolectric.Shadows;
|
||||
import org.robolectric.shadows.ShadowPackageManager;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class DevelopmentTilePreferenceControllerTest {
|
||||
|
||||
@@ -83,7 +85,6 @@ public class DevelopmentTilePreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/119829673")
|
||||
public void display_hasTileService_shouldDisplay() {
|
||||
final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
|
||||
.setPackage(mContext.getPackageName());
|
||||
@@ -92,11 +93,11 @@ public class DevelopmentTilePreferenceControllerTest {
|
||||
info.serviceInfo.name = "abc";
|
||||
info.serviceInfo.icon = R.drawable.ic_settings_24dp;
|
||||
info.serviceInfo.packageName = mContext.getPackageName();
|
||||
mShadowPackageManager.addResolveInfoForIntent(tileProbe, info);
|
||||
mShadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info));
|
||||
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
verify(mScreen).addPreference(any(Preference.class));
|
||||
verify(mScreen, atLeastOnce()).addPreference(any(Preference.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user