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

Fix failed test cases

Browse Source 
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
This commit is contained in:
Jason Chiu
2020-06-24 10:55:31 +08:00
parent 1d6acb4f8c
commit 98a8640de2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -184,6 +184,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@VisibleForTesting @VisibleForTesting
List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) { List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
if (candidates.isEmpty()) {
return candidates;
}
final ExecutorService executor = Executors.newFixedThreadPool(candidates.size()); final ExecutorService executor = Executors.newFixedThreadPool(candidates.size());
final List<ContextualCard> cards = new ArrayList<>(); final List<ContextualCard> cards = new ArrayList<>();
List<Future<ContextualCard>> eligibleCards = new ArrayList<>(); List<Future<ContextualCard>> eligibleCards = new ArrayList<>();

10
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -270,23 +270,27 @@ public class SettingsSliceProviderTest {
@Test @Test
public void onBindSlice_nightModeChanged_shouldReloadTheme() { public void onBindSlice_nightModeChanged_shouldReloadTheme() {
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES; mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
final SliceData data = getDummyData(); final SliceData data = getDummyData();
mProvider.mSliceWeakDataCache.put(data.getUri(), data); mProvider.mSliceWeakDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri()); mProvider.onBindSlice(data.getUri());
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
mProvider.onBindSlice(data.getUri());
assertThat(ShadowTheme.isThemeRebased()).isTrue(); assertThat(ShadowTheme.isThemeRebased()).isTrue();
} }
@Test @Test
public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() { public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO; mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
SliceData data = getDummyData(); SliceData data = getDummyData();
mProvider.mSliceWeakDataCache.put(data.getUri(), data); mProvider.mSliceWeakDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri()); mProvider.onBindSlice(data.getUri());
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
mProvider.onBindSlice(data.getUri());
assertThat(ShadowTheme.isThemeRebased()).isFalse(); assertThat(ShadowTheme.isThemeRebased()).isFalse();
} }