Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aadf2da authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Migrate away from deprecated Truth APIs."

parents 4eb4e06e 46e85a2f

tests/robotests/src/com/android/settings/DisplaySettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ public class DisplaySettingsTest { 
        // Nightmode is currently hidden

        preferenceKeys.remove("night_mode");



        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);

        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);

    }

}

tests/robotests/src/com/android/settings/LegalSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ public class LegalSettingsTest { 


        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);



        assertThat(keys).containsAllIn(niks);

        assertThat(keys).containsAtLeastElementsIn(niks);

    }

}

tests/robotests/src/com/android/settings/SettingsInitializeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,6 @@ public class SettingsInitializeTest { 


        final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();

        assertThat(updatedShortcuts).hasSize(1);

        assertThat(updatedShortcuts.get(0)).isSameAs(info);

        assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);

    }

}

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class AccessibilitySettingsTest { 
        final List<String> keys =

                XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);



        assertThat(keys).containsAllIn(niks);

        assertThat(keys).containsAtLeastElementsIn(niks);

    }



    @Test

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ public final class ApplicationFeatureProviderImplTest { 


        final List<String> expectedPackages = Arrays.asList(testDialer, testSms,

                testLocationHistory);

        assertThat(keepEnabledPackages).containsAllIn(expectedPackages);

        assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);

    }



    @Test