PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-19 22:24:22 +00:00
committed by Android (Google) Code Review
parent 7fa8e3131d c002cd5d5e
commit 347829525c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
View File

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