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

Update tests to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8
This commit is contained in:
jeffreyhuang
2017-11-27 14:55:02 -08:00
parent 90dd4b668a
commit b83fd6c3d1
6 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/AppInfoWithHeader.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.applications; package com.android.settings.applications;
import static com.android.settings.widget.EntityHeaderController.ActionType;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
@@ -25,8 +27,6 @@ import android.util.Log;
import com.android.settings.widget.EntityHeaderController; import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.AppUtils;
import static com.android.settings.widget.EntityHeaderController.ActionType;
public abstract class AppInfoWithHeader extends AppInfoBase { public abstract class AppInfoWithHeader extends AppInfoBase {
private boolean mCreated; private boolean mCreated;
@@ -44,7 +44,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
final Preference pref = EntityHeaderController final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */) .newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getLifecycle()) .setRecyclerView(getListView(), getLifecycle())
.setIcon(IconDrawableFactory.newInstance(activity) .setIcon(IconDrawableFactory.newInstance(getContext())
.getBadgedIcon(mPackageInfo.applicationInfo)) .getBadgedIcon(mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
.setSummary(mPackageInfo) .setSummary(mPackageInfo)

6
src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
View File

@@ -40,7 +40,6 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
private AccountRestrictionHelper mHelper; private AccountRestrictionHelper mHelper;
private UserManager mUserManager; private UserManager mUserManager;
private PackageManager mPm; private PackageManager mPm;
private boolean mCellBroadcastAppLinkEnabled;
public EmergencyBroadcastPreferenceController(Context context, String prefKey) { public EmergencyBroadcastPreferenceController(Context context, String prefKey) {
this(context, new AccountRestrictionHelper(context), prefKey); this(context, new AccountRestrictionHelper(context), prefKey);
@@ -54,8 +53,6 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
mHelper = helper; mHelper = helper;
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mPm = mContext.getPackageManager(); mPm = mContext.getPackageManager();
// Enable link to CMAS app settings depending on the value in config.xml.
mCellBroadcastAppLinkEnabled = isCellBroadcastAppLinkEnabled();
} }
@Override @Override
@@ -79,12 +76,13 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return mUserManager.isAdminUser() && mCellBroadcastAppLinkEnabled return mUserManager.isAdminUser() && isCellBroadcastAppLinkEnabled()
&& !mHelper.hasBaseUserRestriction( && !mHelper.hasBaseUserRestriction(
UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId()); UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId());
} }
private boolean isCellBroadcastAppLinkEnabled() { private boolean isCellBroadcastAppLinkEnabled() {
// Enable link to CMAS app settings depending on the value in config.xml.
boolean enabled = mContext.getResources().getBoolean( boolean enabled = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_cellBroadcastAppLinks); com.android.internal.R.bool.config_cellBroadcastAppLinks);
if (enabled) { if (enabled) {

30
tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
View File

@@ -16,32 +16,35 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.content.Context; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.XmlTestUtils;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import java.util.List; import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class AppAndNotificationDashboardFragmentTest { public class AppAndNotificationDashboardFragmentTest {
@Test @Test
@Config(shadows = {ShadowEmergencyBroadcastPreferenceController.class})
public void testNonIndexableKeys_existInXmlLayout() { public void testNonIndexableKeys_existInXmlLayout() {
final Context context = spy(RuntimeEnvironment.application); final Context context = spy(RuntimeEnvironment.application);
UserManager manager = mock(UserManager.class); UserManager manager = mock(UserManager.class);
@@ -56,4 +59,13 @@ public class AppAndNotificationDashboardFragmentTest {
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAllIn(niks);
} }
@Implements(EmergencyBroadcastPreferenceController.class)
public static class ShadowEmergencyBroadcastPreferenceController {
@Implementation
public boolean isAvailable() {
return true;
}
}
} }

15
tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
View File

@@ -16,6 +16,13 @@
package com.android.settings.applications; package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -49,14 +56,8 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
shadows = ShadowEntityHeaderController.class) shadows = ShadowEntityHeaderController.class)
public class AppInfoWithHeaderTest { public class AppInfoWithHeaderTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)

31
tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
View File

@@ -8,8 +8,10 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.R;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -18,11 +20,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import com.android.settings.R;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class AppStorageSizesControllerTest { public class AppStorageSizesControllerTest {
private static final String COMPUTING = "Computing…"; private static final String COMPUTING = "Computing…";
private static final String INVALID_SIZE = "Couldn’t compute package size."; private static final String INVALID_SIZE = "Couldn’t compute package size.";
@@ -85,9 +84,9 @@ public class AppStorageSizesControllerTest {
mController.setResult(result); mController.setResult(result);
mController.updateUi(mContext); mController.updateUi(mContext);
assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
assertThat(mCachePreference.getSummary()).isEqualTo("10.00 B"); assertThat(mCachePreference.getSummary()).isEqualTo("10 B");
assertThat(mDataPreference.getSummary()).isEqualTo("90.00 B"); assertThat(mDataPreference.getSummary()).isEqualTo("90 B");
assertThat(mTotalPreference.getSummary()).isEqualTo("101 B"); assertThat(mTotalPreference.getSummary()).isEqualTo("101 B");
} }
@@ -103,10 +102,10 @@ public class AppStorageSizesControllerTest {
mController.setCacheCleared(true); mController.setCacheCleared(true);
mController.updateUi(mContext); mController.updateUi(mContext);
assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
assertThat(mCachePreference.getSummary()).isEqualTo("0.00 B"); assertThat(mCachePreference.getSummary()).isEqualTo("0 B");
assertThat(mDataPreference.getSummary()).isEqualTo("90.00 B"); assertThat(mDataPreference.getSummary()).isEqualTo("90 B");
assertThat(mTotalPreference.getSummary()).isEqualTo("91.00 B"); assertThat(mTotalPreference.getSummary()).isEqualTo("91 B");
} }
@Test @Test
@@ -121,9 +120,9 @@ public class AppStorageSizesControllerTest {
mController.setDataCleared(true); mController.setDataCleared(true);
mController.updateUi(mContext); mController.updateUi(mContext);
assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
assertThat(mCachePreference.getSummary()).isEqualTo("0.00 B"); assertThat(mCachePreference.getSummary()).isEqualTo("0 B");
assertThat(mDataPreference.getSummary()).isEqualTo("0.00 B"); assertThat(mDataPreference.getSummary()).isEqualTo("0 B");
assertThat(mTotalPreference.getSummary()).isEqualTo("1.00 B"); assertThat(mTotalPreference.getSummary()).isEqualTo("1 B");
} }
} }

11
tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications; package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.anyDouble;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
@@ -83,9 +84,9 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config( @Config(
manifest = TestConfig.MANIFEST_PATH, manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION, sdk = TestConfig.SDK_VERSION_O,
shadows = InstalledAppDetailsTest.ShadowUtils.class shadows = InstalledAppDetailsTest.ShadowUtils.class
) )
public final class InstalledAppDetailsTest { public final class InstalledAppDetailsTest {
@@ -192,7 +193,7 @@ public final class InstalledAppDetailsTest {
when(stats.getTotalBytes()).thenReturn(1L); when(stats.getTotalBytes()).thenReturn(1L);
assertThat(InstalledAppDetails.getStorageSummary(context, stats, true)) assertThat(InstalledAppDetails.getStorageSummary(context, stats, true))
.isEqualTo("1.00 B used in external storage"); .isEqualTo("1 B used in external storage");
} }
@Test @Test
@@ -202,7 +203,7 @@ public final class InstalledAppDetailsTest {
when(stats.getTotalBytes()).thenReturn(1L); when(stats.getTotalBytes()).thenReturn(1L);
assertThat(InstalledAppDetails.getStorageSummary(context, stats, false)) assertThat(InstalledAppDetails.getStorageSummary(context, stats, false))
.isEqualTo("1.00 B used in internal storage"); .isEqualTo("1 B used in internal storage");
} }
@Test @Test