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

Merge "Fix a bug where override filter was always on." into oc-dev am: 408fd90102

Browse Source 
am: 7d50d9db12

Change-Id: Ie9e9b3978e7a2f52fdd63e203a740068188dc285
This commit is contained in:
Daniel Nishi
2017-05-04 17:38:31 +00:00
committed by android-build-merger
parent 944030e53f 7d50d9db12
commit 31de4c1766
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
View File

@@ -23,14 +23,15 @@ import static org.mockito.Mockito.mock;
import android.content.pm.ApplicationInfo;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import org.junit.Test;
public class ManageApplicationsTest {
@Test
public void getStorageFilter_filtersVolumeForAudio() {
ApplicationsState.AppFilter filter =
ManageApplications.getStorageFilter(
public void getOverrideFilter_filtersVolumeForAudio() {
AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.LIST_TYPE_STORAGE,
ManageApplications.STORAGE_TYPE_MUSIC,
"uuid");
@@ -44,9 +45,9 @@ public class ManageApplicationsTest {
}
@Test
public void getStorageFilter_filtersVolumeForVideo() {
ApplicationsState.AppFilter filter =
ManageApplications.getStorageFilter(
public void getOverrideFilter_filtersVolumeForVideo() {
AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.LIST_TYPE_MOVIES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -60,9 +61,9 @@ public class ManageApplicationsTest {
}
@Test
public void getStorageFilter_filtersVolumeForGames() {
public void getOverrideFilter_filtersVolumeForGames() {
ApplicationsState.AppFilter filter =
ManageApplications.getStorageFilter(
ManageApplications.getOverrideFilter(
ManageApplications.LIST_TYPE_GAMES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -74,4 +75,14 @@ public class ManageApplicationsTest {
assertThat(filter.filterApp(appEntry)).isTrue();
}
@Test
public void getOverrideFilter_isEmptyNormally() {
ApplicationsState.AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.LIST_TYPE_MAIN,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
assertThat(filter).isNull();
}
}