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

Migrate away from deprecated Truth APIs.

Browse Source 
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.

Bug: 168765701
Test: m checkbuild
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
This commit is contained in:
Alexander Dorokhine
2020-09-18 15:43:47 -07:00
parent 74e3692ab9
commit 46e85a2fad
36 changed files with 138 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/DisplaySettingsTest.java
View File

@@ -35,6 +35,6 @@ public class DisplaySettingsTest {
// Nightmode is currently hidden // Nightmode is currently hidden
preferenceKeys.remove("night_mode"); preferenceKeys.remove("night_mode");
assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys); assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
} }
} }

2
tests/robotests/src/com/android/settings/LegalSettingsTest.java
View File

@@ -46,6 +46,6 @@ public class LegalSettingsTest {
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal); final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
} }

2
tests/robotests/src/com/android/settings/SettingsInitializeTest.java
View File

@@ -94,6 +94,6 @@ public class SettingsInitializeTest {
final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts(); final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
assertThat(updatedShortcuts).hasSize(1); assertThat(updatedShortcuts).hasSize(1);
assertThat(updatedShortcuts.get(0)).isSameAs(info); assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
} }
} }

2
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -99,7 +99,7 @@ public class AccessibilitySettingsTest {
final List<String> keys = final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings); XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
View File

@@ -280,7 +280,7 @@ public final class ApplicationFeatureProviderImplTest {
final List<String> expectedPackages = Arrays.asList(testDialer, testSms, final List<String> expectedPackages = Arrays.asList(testDialer, testSms,
testLocationHistory); testLocationHistory);
assertThat(keepEnabledPackages).containsAllIn(expectedPackages); assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
View File

@@ -420,7 +420,7 @@ public class AppButtonsPreferenceControllerTest {
mController.forceStopPackage(PACKAGE_NAME); mController.forceStopPackage(PACKAGE_NAME);
verify(mAm).forceStopPackage(PACKAGE_NAME); verify(mAm).forceStopPackage(PACKAGE_NAME);
assertThat(mController.mAppEntry).isSameAs(appEntry); assertThat(mController.mAppEntry).isSameInstanceAs(appEntry);
verify(mController).updateForceStopButton(); verify(mController).updateForceStopButton();
} }

11
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint; package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
@@ -92,7 +93,7 @@ public class FingerprintEnrollFindSensorTest {
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity); ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity = IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult(); shadowActivity.getNextStartedActivityForResult();
assertThat(startedActivity).named("Next activity 1").isNotNull(); assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent()) assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class)); .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
} }
@@ -107,12 +108,12 @@ public class FingerprintEnrollFindSensorTest {
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity); ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity = IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult(); shadowActivity.getNextStartedActivityForResult();
assertThat(startedActivity).named("Next activity 1").isNotNull(); assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent()) assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class)); .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
// Should only start one next activity // Should only start one next activity
assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2") assertWithMessage("Next activity 2").that(shadowActivity.getNextStartedActivityForResult())
.isNull(); .isNull();
} }
@@ -129,7 +130,7 @@ public class FingerprintEnrollFindSensorTest {
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity); ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity = IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult(); shadowActivity.getNextStartedActivityForResult();
assertThat(startedActivity).named("Next activity").isNotNull(); assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent()) assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class)); .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
} }
@@ -140,7 +141,7 @@ public class FingerprintEnrollFindSensorTest {
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick(); layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity); ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
assertThat(shadowActivity.getResultCode()).named("result code") assertWithMessage("result code").that(shadowActivity.getResultCode())
.isEqualTo(BiometricEnrollBase.RESULT_SKIP); .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
} }

8
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint; package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -70,12 +71,13 @@ public class FingerprintSuggestionActivityTest {
final Button cancelButton = final Button cancelButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(cancelButton.getText().toString()).isEqualTo("Cancel"); assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE); assertWithMessage("Cancel visible").that(cancelButton.getVisibility())
.isEqualTo(View.VISIBLE);
cancelButton.performClick(); cancelButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get()); ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue(); assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code") assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(Activity.RESULT_CANCELED); .isEqualTo(Activity.RESULT_CANCELED);
} }

5
tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY; import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -76,7 +77,7 @@ public class SetupFingerprintEnrollFinishTest {
ShadowActivity.IntentForResult startedActivity = ShadowActivity.IntentForResult startedActivity =
Shadows.shadowOf(mActivity).getNextStartedActivityForResult(); Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
assertThat(startedActivity).named("Next activity").isNotNull(); assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent()) assertThat(startedActivity.intent.getComponent())
.isEqualTo(enrollingComponent); .isEqualTo(enrollingComponent);
} }
@@ -91,7 +92,7 @@ public class SetupFingerprintEnrollFinishTest {
ShadowActivity.IntentForResult startedActivity = ShadowActivity.IntentForResult startedActivity =
Shadows.shadowOf(mActivity).getNextStartedActivityForResult(); Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
assertThat(startedActivity).named("Next activity").isNotNull(); assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent()) assertThat(startedActivity.intent.getComponent())
.isEqualTo(enrollingComponent); .isEqualTo(enrollingComponent);
} }

13
tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint; package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -102,12 +103,12 @@ public class SetupFingerprintEnrollIntroductionTest {
mController.get().findViewById(R.id.setup_wizard_layout); mController.get().findViewById(R.id.setup_wizard_layout);
final Button skipButton = final Button skipButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE); assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
skipButton.performClick(); skipButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get()); ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue(); assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code") assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(SetupSkipDialog.RESULT_SKIP); .isEqualTo(SetupSkipDialog.RESULT_SKIP);
} }
@@ -121,12 +122,12 @@ public class SetupFingerprintEnrollIntroductionTest {
mController.get().findViewById(R.id.setup_wizard_layout); mController.get().findViewById(R.id.setup_wizard_layout);
final Button skipButton = final Button skipButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE); assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
skipButton.performClick(); skipButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get()); ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue(); assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code") assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(BiometricEnrollBase.RESULT_SKIP); .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
} }

2
tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
View File

@@ -47,6 +47,6 @@ public class MetricsFeatureProviderTest {
MetricsFeatureProvider feature2 = MetricsFeatureProvider feature2 =
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
assertThat(feature1).isSameAs(feature2); assertThat(feature1).isSameInstanceAs(feature2);
} }
} }

34
tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
View File

@@ -67,7 +67,7 @@ public class CategoryManagerTest {
@Test @Test
public void getInstance_shouldBeSingleton() { public void getInstance_shouldBeSingleton() {
assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext)); assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
} }
@Test @Test
@@ -147,9 +147,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap); mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
// Verify they are now sorted. // Verify they are now sorted.
assertThat(category.getTile(0)).isSameAs(tile3); assertThat(category.getTile(0)).isSameInstanceAs(tile3);
assertThat(category.getTile(1)).isSameAs(tile1); assertThat(category.getTile(1)).isSameInstanceAs(tile1);
assertThat(category.getTile(2)).isSameAs(tile2); assertThat(category.getTile(2)).isSameInstanceAs(tile2);
} }
@Test @Test
@@ -170,9 +170,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap); mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify they are now sorted. // Verify they are now sorted.
assertThat(category.getTile(0)).isSameAs(tile2); assertThat(category.getTile(0)).isSameInstanceAs(tile2);
assertThat(category.getTile(1)).isSameAs(tile1); assertThat(category.getTile(1)).isSameInstanceAs(tile1);
assertThat(category.getTile(2)).isSameAs(tile3); assertThat(category.getTile(2)).isSameInstanceAs(tile3);
} }
@Test @Test
@@ -192,9 +192,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap); mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed // Verify the sorting order is not changed
assertThat(category.getTile(0)).isSameAs(tile1); assertThat(category.getTile(0)).isSameInstanceAs(tile1);
assertThat(category.getTile(1)).isSameAs(tile2); assertThat(category.getTile(1)).isSameInstanceAs(tile2);
assertThat(category.getTile(2)).isSameAs(tile3); assertThat(category.getTile(2)).isSameInstanceAs(tile3);
} }
@Test @Test
@@ -217,10 +217,10 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap); mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed // Verify the sorting order is not changed
assertThat(category.getTile(0)).isSameAs(tile1); assertThat(category.getTile(0)).isSameInstanceAs(tile1);
assertThat(category.getTile(1)).isSameAs(tile2); assertThat(category.getTile(1)).isSameInstanceAs(tile2);
assertThat(category.getTile(2)).isSameAs(tile3); assertThat(category.getTile(2)).isSameInstanceAs(tile3);
assertThat(category.getTile(3)).isSameAs(tile4); assertThat(category.getTile(3)).isSameInstanceAs(tile4);
} }
@Test @Test
@@ -242,9 +242,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap); mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is internal first, follow by package name ordering // Verify the sorting order is internal first, follow by package name ordering
assertThat(category.getTile(0)).isSameAs(tile2); assertThat(category.getTile(0)).isSameInstanceAs(tile2);
assertThat(category.getTile(1)).isSameAs(tile3); assertThat(category.getTile(1)).isSameInstanceAs(tile3);
assertThat(category.getTile(2)).isSameAs(tile1); assertThat(category.getTile(2)).isSameInstanceAs(tile1);
} }
@Test @Test

4
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -129,7 +129,7 @@ public class DashboardFragmentTest {
final TestPreferenceController retrievedController = mTestFragment.use final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class); (TestPreferenceController.class);
assertThat(controller).isSameAs(retrievedController); assertThat(controller).isSameInstanceAs(retrievedController);
} }
@Test @Test
@@ -142,7 +142,7 @@ public class DashboardFragmentTest {
final TestPreferenceController retrievedController = mTestFragment.use final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class); (TestPreferenceController.class);
assertThat(controller1).isSameAs(retrievedController); assertThat(controller1).isSameInstanceAs(retrievedController);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
View File

@@ -54,7 +54,7 @@ public class TimeZoneDataTest {
when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList()); when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones); when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones()) assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
.isSameAs(countryTimeZones); .isSameInstanceAs(countryTimeZones);
} }
@Test @Test

4
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
View File

@@ -533,7 +533,7 @@ public class BatteryUtilsTest {
BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList, BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
BatterySipper.DrainType.SCREEN); BatterySipper.DrainType.SCREEN);
assertThat(sipper).isSameAs(mScreenBatterySipper); assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
} }
@Test @Test
@@ -541,7 +541,7 @@ public class BatteryUtilsTest {
BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList, BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
BatterySipper.DrainType.APP); BatterySipper.DrainType.APP);
assertThat(sipper).isSameAs(mNormalBatterySipper); assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -232,7 +232,7 @@ public class PowerUsageSummaryTest {
final List<String> keys = final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary); XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
@Test @Test

4
tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
View File

@@ -133,7 +133,7 @@ public class LanguageAndInputSettingsTest {
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId); final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
@Test @Test
@@ -151,7 +151,7 @@ public class LanguageAndInputSettingsTest {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }
assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys); assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
} }
/** /**

7
tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
View File

@@ -22,6 +22,7 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME
import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -145,13 +146,13 @@ public class PrivateDnsModeDialogPreferenceTest {
mPreference.mEditText.setText(invalid); mPreference.mEditText.setText(invalid);
mPreference.onCheckedChanged(null, R.id.private_dns_mode_off); mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue(); assertWithMessage("off: " + invalid).that(mSaveButton.isEnabled()).isTrue();
mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic); mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue(); assertWithMessage("opportunistic: " + invalid).that(mSaveButton.isEnabled()).isTrue();
mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider); mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse(); assertWithMessage("provider: " + invalid).that(mSaveButton.isEnabled()).isFalse();
} }
} }

2
tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
View File

@@ -113,7 +113,7 @@ public class PaymentSettingsTest {
final List<String> niks = final List<String> niks =
PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY); assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
View File

@@ -70,7 +70,7 @@ public class SoundSettingsTest {
keys.add("ring_volume"); keys.add("ring_volume");
keys.add("notification_volume"); keys.add("notification_volume");
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
@Test @Test

56
tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
View File

@@ -22,6 +22,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE; import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
@@ -84,24 +85,24 @@ public class ChooseLockGenericControllerTest {
public void isScreenLockVisible_shouldRespectResourceConfig() { public void isScreenLockVisible_shouldRespectResourceConfig() {
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
// All locks except managed defaults to visible // All locks except managed defaults to visible
assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible") assertWithMessage(lock + " visible").that(mController.isScreenLockVisible(lock))
.isEqualTo(lock != ScreenLockType.MANAGED); .isEqualTo(lock != ScreenLockType.MANAGED);
} }
SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true); SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true); SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible") assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
.isFalse();
assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
.isFalse(); .isFalse();
assertWithMessage("SWIPE visible").that(
mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
} }
@Test @Test
public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() { public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
mController = new ChooseLockGenericController(application, 1 /* userId */); mController = new ChooseLockGenericController(application, 1 /* userId */);
assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible") assertWithMessage("SWIPE visible").that(
.isFalse(); mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible") assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
.isFalse(); .isFalse();
} }
@@ -109,34 +110,31 @@ public class ChooseLockGenericControllerTest {
public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() { public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable(); doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible") assertWithMessage("MANAGED visible").that(
.isTrue(); mController.isScreenLockVisible(ScreenLockType.MANAGED)).isTrue();
} }
@Test @Test
public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() { public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1)) assertWithMessage(lock + " enabled").that(
.named(lock + " enabled") mController.isScreenLockEnabled(lock, lock.maxQuality + 1)).isFalse();
.isFalse();
} }
} }
@Test @Test
public void isScreenLockEnabled_equalQuality_shouldReturnTrue() { public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality)) assertWithMessage(lock + " enabled").that(
.named(lock + " enabled") mController.isScreenLockEnabled(lock, lock.defaultQuality)).isTrue();
.isTrue();
} }
} }
@Test @Test
public void isScreenLockEnabled_higherQuality_shouldReturnTrue() { public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1)) assertWithMessage(lock + " enabled").that(
.named(lock + " enabled") mController.isScreenLockEnabled(lock, lock.maxQuality - 1)).isTrue();
.isTrue();
} }
} }
@@ -144,9 +142,8 @@ public class ChooseLockGenericControllerTest {
public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() { public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable(); doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)) assertWithMessage(lock + " disabledByAdmin").that(
.named(lock + " disabledByAdmin") mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)).isTrue();
.isTrue();
} }
} }
@@ -154,9 +151,8 @@ public class ChooseLockGenericControllerTest {
public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() { public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable(); doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)) assertWithMessage(lock + " disabledByAdmin").that(
.named(lock + " disabledByAdmin") mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)).isFalse();
.isFalse();
} }
} }
@@ -164,18 +160,16 @@ public class ChooseLockGenericControllerTest {
public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() { public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable(); doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) { for (ScreenLockType lock : ScreenLockType.values()) {
assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)) assertWithMessage(lock + " disabledByAdmin").that(
.named(lock + " disabledByAdmin") mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)).isFalse();
.isFalse();
} }
} }
@Test @Test
public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() { public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable(); doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
assertThat(mController.isScreenLockDisabledByAdmin( assertWithMessage("MANANGED disabledByAdmin").that(mController.isScreenLockDisabledByAdmin(
ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)) ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
.named("MANANGED disabledByAdmin")
.isTrue(); .isTrue();
} }
@@ -218,7 +212,7 @@ public class ChooseLockGenericControllerTest {
final int upgradedQuality = final int upgradedQuality =
mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
assertThat(upgradedQuality).named("upgradedQuality") assertWithMessage("upgradedQuality").that(upgradedQuality)
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
} }
@@ -230,7 +224,7 @@ public class ChooseLockGenericControllerTest {
final int upgradedQuality = final int upgradedQuality =
mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
assertThat(upgradedQuality).named("upgradedQuality") assertWithMessage("upgradedQuality").that(upgradedQuality)
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
} }

35
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -33,6 +33,7 @@ import static com.android.settings.password.ChooseLockGeneric.CONFIRM_CREDENTIAL
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -92,18 +93,16 @@ public class ChooseLockPasswordTest {
.setUserId(123) .setUserId(123)
.build(); .build();
assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false)) assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(
.named("EXTRA_KEY_FORCE_VERIFY") intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
.isFalse(); .isFalse();
assertThat((LockscreenCredential) intent.getParcelableExtra( assertWithMessage("EXTRA_KEY_PASSWORD").that(
(LockscreenCredential) intent.getParcelableExtra(
ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD)) ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
.named("EXTRA_KEY_PASSWORD")
.isEqualTo(LockscreenCredential.createPassword("password")); .isEqualTo(LockscreenCredential.createPassword("password"));
assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0)) assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
.named("PASSWORD_TYPE_KEY")
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC); .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0)) assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.named("EXTRA_USER_ID")
.isEqualTo(123); .isEqualTo(123);
} }
@@ -115,15 +114,13 @@ public class ChooseLockPasswordTest {
.setUserId(123) .setUserId(123)
.build(); .build();
assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(
false)) intent.getBooleanExtra(
.named("EXTRA_KEY_REQUEST_GK_PW") ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
.isTrue(); .isTrue();
assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0)) assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
.named("PASSWORD_TYPE_KEY")
.isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC); .isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0)) assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.named("EXTRA_USER_ID")
.isEqualTo(123); .isEqualTo(123);
} }
@@ -151,12 +148,12 @@ public class ChooseLockPasswordTest {
.setProfileToUnify(23, LockscreenCredential.createNone()) .setProfileToUnify(23, LockscreenCredential.createNone())
.build(); .build();
assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0)) assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(
.named("EXTRA_KEY_UNIFICATION_PROFILE_ID") intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
.isEqualTo(23); .isEqualTo(23);
assertThat((LockscreenCredential) intent.getParcelableExtra( assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
(LockscreenCredential) intent.getParcelableExtra(
ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL)) ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
.named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
.isNotNull(); .isNotNull();
} }

26
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password; package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -58,16 +59,13 @@ public class ChooseLockPatternTest {
.setUserId(123) .setUserId(123)
.build(); .build();
assertThat(intent assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(intent
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false)) .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
.named("EXTRA_KEY_FORCE_VERIFY")
.isFalse(); .isFalse();
assertThat((LockscreenCredential) intent assertWithMessage("EXTRA_KEY_PASSWORD").that((LockscreenCredential) intent
.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD)) .getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
.named("EXTRA_KEY_PASSWORD")
.isEqualTo(createPattern("1234")); .isEqualTo(createPattern("1234"));
assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0)) assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.named("EXTRA_USER_ID")
.isEqualTo(123); .isEqualTo(123);
} }
@@ -78,13 +76,11 @@ public class ChooseLockPatternTest {
.setUserId(123) .setUserId(123)
.build(); .build();
assertThat(intent assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(intent
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false)) .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
.named("EXTRA_KEY_REQUEST_GK_PW")
.isTrue(); .isTrue();
assertThat(intent assertWithMessage("EXTRA_USER_ID")
.getIntExtra(Intent.EXTRA_USER_ID, 0)) .that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.named("EXTRA_USER_ID")
.isEqualTo(123); .isEqualTo(123);
} }
@@ -94,12 +90,12 @@ public class ChooseLockPatternTest {
.setProfileToUnify(23, LockscreenCredential.createNone()) .setProfileToUnify(23, LockscreenCredential.createNone())
.build(); .build();
assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0)) assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(intent
.named("EXTRA_KEY_UNIFICATION_PROFILE_ID") .getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
.isEqualTo(23); .isEqualTo(23);
assertThat((LockscreenCredential) intent.getParcelableExtra( assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
(LockscreenCredential) intent.getParcelableExtra(
ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL)) ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
.named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
.isNotNull(); .isNotNull();
} }

5
tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password; package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -115,7 +116,7 @@ public class SetupChooseLockPasswordTest {
activity.findViewById(R.id.screen_lock_options).performClick(); activity.findViewById(R.id.screen_lock_options).performClick();
AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog(); AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
int count = latestAlertDialog.getListView().getCount(); int count = latestAlertDialog.getListView().getCount();
assertThat(count).named("List items shown").isEqualTo(3); assertWithMessage("List items shown").that(count).isEqualTo(3);
} }
@Test @Test
@@ -141,7 +142,7 @@ public class SetupChooseLockPasswordTest {
assertThat(nextStartedActivity).isNotNull(); assertThat(nextStartedActivity).isNotNull();
assertThat(nextStartedActivity.getBooleanExtra( assertThat(nextStartedActivity.getBooleanExtra(
ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue(); ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra") assertWithMessage("Foo extra").that(nextStartedActivity.getStringExtra("foo"))
.isEqualTo("bar"); .isEqualTo("bar");
} }

3
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password; package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
@@ -112,7 +113,7 @@ public class SetupChooseLockPatternTest {
AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(chooserDialog).isNotNull(); assertThat(chooserDialog).isNotNull();
int count = chooserDialog.getListView().getCount(); int count = chooserDialog.getListView().getCount();
assertThat(count).named("List items shown").isEqualTo(3); assertWithMessage("List items shown").that(count).isEqualTo(3);
} }
@Config(qualifiers = "sw400dp") @Config(qualifiers = "sw400dp")

2
tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
View File

@@ -117,7 +117,7 @@ public class SettingsSearchIndexablesProviderTest {
} }
assertThat(keys).hasSize(3); assertThat(keys).hasSize(3);
assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5"); assertThat(keys).containsAtLeast("pref_key_1", "pref_key_3", "pref_key_5");
} }
@Test @Test

2
tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
View File

@@ -80,7 +80,7 @@ public class InstallCertificateFromStorageTest {
final List<String> nonIndexableKeys = final List<String> nonIndexableKeys =
SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(nonIndexableKeys).containsAllIn(mTestKeys); assertThat(nonIndexableKeys).containsAtLeastElementsIn(mTestKeys);
} }
} }

2
tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
View File

@@ -74,7 +74,7 @@ public class LockscreenDashboardFragmentTest {
List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application, List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
mTestFragment.getPreferenceScreenResId()); mTestFragment.getPreferenceScreenResId());
assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON, assertThat(keys).containsAtLeast(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE, LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER); LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
} }

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

@@ -48,7 +48,7 @@ public class SecurityFeatureProviderImplTest {
final TrustAgentManager m1 = mImpl.getTrustAgentManager(); final TrustAgentManager m1 = mImpl.getTrustAgentManager();
final TrustAgentManager m2 = mImpl.getTrustAgentManager(); final TrustAgentManager m2 = mImpl.getTrustAgentManager();
assertThat(m1).isSameAs(m2); assertThat(m1).isSameInstanceAs(m2);
} }
@Test @Test
@@ -56,6 +56,6 @@ public class SecurityFeatureProviderImplTest {
final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext); final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext);
final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext); final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext);
assertThat(l1).isSameAs(l2); assertThat(l1).isSameInstanceAs(l2);
} }
} }

2
tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
View File

@@ -73,7 +73,7 @@ public class SystemDashboardFragmentTest {
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId); final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
assertThat(keys).containsAllIn(niks); assertThat(keys).containsAtLeastElementsIn(niks);
} }
@Test @Test

12
tests/robotests/src/com/android/settings/users/UserSettingsTest.java
View File

@@ -398,7 +398,7 @@ public class UserSettingsTest {
ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class); ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
verify(mFragment.mUserListCategory).addPreference(captor.capture()); verify(mFragment.mUserListCategory).addPreference(captor.capture());
UserPreference adminPref = captor.getValue(); UserPreference adminPref = captor.getValue();
assertThat(adminPref).isSameAs(mMePreference); assertThat(adminPref).isSameInstanceAs(mMePreference);
} }
@Test @Test
@@ -417,7 +417,7 @@ public class UserSettingsTest {
assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST); assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST);
assertThat(guestPref.isEnabled()).isEqualTo(true); assertThat(guestPref.isEnabled()).isEqualTo(true);
assertThat(guestPref.isSelectable()).isEqualTo(true); assertThat(guestPref.isSelectable()).isEqualTo(true);
assertThat(guestPref.getOnPreferenceClickListener()).isSameAs(mFragment); assertThat(guestPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
} }
@Test @Test
@@ -436,7 +436,7 @@ public class UserSettingsTest {
assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID); assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID);
assertThat(userPref.isEnabled()).isEqualTo(true); assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true); assertThat(userPref.isSelectable()).isEqualTo(true);
assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment); assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
} }
@Test @Test
@@ -456,7 +456,7 @@ public class UserSettingsTest {
assertThat(userPref.getSummary()).isEqualTo("Restricted profile"); assertThat(userPref.getSummary()).isEqualTo("Restricted profile");
assertThat(userPref.isEnabled()).isEqualTo(true); assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true); assertThat(userPref.isSelectable()).isEqualTo(true);
assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment); assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
} }
@Test @Test
@@ -493,7 +493,7 @@ public class UserSettingsTest {
assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile"); assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile");
assertThat(userPref.isEnabled()).isEqualTo(true); assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true); assertThat(userPref.isSelectable()).isEqualTo(true);
assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment); assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
} }
@Test @Test
@@ -518,7 +518,7 @@ public class UserSettingsTest {
assertThat(userPref.getSummary()).isEqualTo("Not set up"); assertThat(userPref.getSummary()).isEqualTo("Not set up");
assertThat(userPref.isEnabled()).isEqualTo(false); assertThat(userPref.isEnabled()).isEqualTo(false);
assertThat(userPref.isSelectable()).isEqualTo(true); assertThat(userPref.isSelectable()).isEqualTo(true);
assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment); assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
View File

@@ -36,6 +36,6 @@ public class LocalClassLoaderContextThemeWrapperTest {
final Class clazz = LocalClassLoaderContextThemeWrapperTest.class; final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0); mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader()); assertThat(mContextThemeWrapper.getClassLoader()).isSameInstanceAs(clazz.getClassLoader());
} }
} }

2
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -105,7 +105,7 @@ public class EntityHeaderControllerTest {
mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView); mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
View view = mController.done(mActivity); View view = mController.done(mActivity);
assertThat(view).isSameAs(inputView); assertThat(view).isSameInstanceAs(inputView);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
View File

@@ -36,6 +36,6 @@ public class ConfigureWifiSettingsTest {
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId); final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
assertThat(keys).isNotNull(); assertThat(keys).isNotNull();
assertThat(niks).containsAllIn(keys); assertThat(niks).containsAtLeastElementsIn(keys);
} }
} }

2
tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
View File

@@ -103,7 +103,7 @@ public class WifiP2pSettingsTest {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }
assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys); assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
} }
@Test @Test

3
tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
View File

@@ -27,6 +27,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;
@@ -80,7 +81,7 @@ public class SetupChooseLockPasswordAppTest {
assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label)); assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
skipOrClearButton.performClick(); skipOrClearButton.performClick();
assertThat(activity.isFinishing()).named("Is finishing").isTrue(); assertWithMessage("Is finishing").that(activity.isFinishing()).isTrue();
} }
@Test @Test