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

Commit 46e85a2f authored by Alexander Dorokhine's avatar Alexander Dorokhine
Browse files

Migrate away from deprecated Truth APIs. 

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
parent 74e3692a

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