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

Merge "Query the security feature provider on separate threads."

Browse Source
This commit is contained in:
William Luh
2017-02-28 17:20:31 +00:00
committed by Android (Google) Code Review
parent 92033fdb6f 4f80f221c6
commit c8c6c4b1c7
3 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
View File

@@ -42,6 +42,7 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowLooper;
import java.util.Map;
@@ -102,8 +103,11 @@ public class SecurityFeatureProviderImplTest {
@Test
public void updateTilesData_shouldNotProcessEmptyScreenOrTiles() {
mImpl.updatePreferences(mContext, null, null);
mImpl.updatePreferences(mContext, new PreferenceScreen(mContext, null), null);
mImpl.updatePreferencesToRunOnWorkerThread(mContext, null, null);
ShadowLooper.runUiThreadTasks();
mImpl.updatePreferencesToRunOnWorkerThread(
mContext, new PreferenceScreen(mContext, null), null);
ShadowLooper.runUiThreadTasks();
verifyNoMoreInteractions(mPackageManager);
}
@@ -111,13 +115,17 @@ public class SecurityFeatureProviderImplTest {
public void updateTilesData_shouldNotProcessNonMatchingPreference() {
DashboardCategory dashboardCategory = new DashboardCategory();
dashboardCategory.addTile(new Tile());
mImpl.updatePreferences(mContext, getPreferenceScreen(), dashboardCategory);
mImpl.updatePreferencesToRunOnWorkerThread(
mContext, getPreferenceScreen(), dashboardCategory);
ShadowLooper.runUiThreadTasks();
verifyNoMoreInteractions(mPackageManager);
}
@Test
public void updateTilesData_shouldNotProcessMatchingPreferenceWithNoData() {
mImpl.updatePreferences(mContext, getPreferenceScreen(), getDashboardCategory());
mImpl.updatePreferencesToRunOnWorkerThread(
mContext, getPreferenceScreen(), getDashboardCategory());
ShadowLooper.runUiThreadTasks();
verifyNoMoreInteractions(mPackageManager);
}
@@ -135,7 +143,8 @@ public class SecurityFeatureProviderImplTest {
dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
dashboardCategory.getTile(0).metaData = bundle;
mImpl.updatePreferences(mContext, screen, dashboardCategory);
mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
ShadowLooper.runUiThreadTasks();
verify(screen.findPreference(MOCK_KEY)).setIcon(mMockDrawable);
verify(screen.findPreference(MOCK_KEY)).setSummary(MOCK_SUMMARY);
}
@@ -157,7 +166,8 @@ public class SecurityFeatureProviderImplTest {
dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
dashboardCategory.getTile(0).metaData = bundle;
mImpl.updatePreferences(mContext, screen, dashboardCategory);
mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
ShadowLooper.runUiThreadTasks();
verify(screen.findPreference(MOCK_KEY), never()).setSummary(anyString());
}