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

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

Merge "Migrate away from deprecated Truth APIs."

parents 266e17f8 4697f76e

core/java/android/permission/Permissions.md

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ private val whitelistedPkgs = listOf("my.whitelisted.package") 


@Test

fun onlySomeAppsAreAllowedToHavePermissionGranted() {

    assertThat(whitelistedPkgs).containsAllIn(

    assertThat(whitelistedPkgs).containsAtLeastElementsIn(

            context.packageManager.getInstalledPackages(MATCH_ALL)

                    .filter { pkg ->

                        context.checkPermission(android.Manifest.permission.MY_PRIVILEGED_PERMISSION, -1,

core/tests/coretests/src/android/app/NotificationHistoryTest.java

+7 −7
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ public class NotificationHistoryTest { 
        history.addNotificationToWrite(n);



        assertThat(history.getNotificationsToWrite().size()).isEqualTo(2);

        assertThat(history.getNotificationsToWrite().get(0)).isSameAs(n2);

        assertThat(history.getNotificationsToWrite().get(1)).isSameAs(n);

        assertThat(history.getNotificationsToWrite().get(0)).isSameInstanceAs(n2);

        assertThat(history.getNotificationsToWrite().get(1)).isSameInstanceAs(n);

        assertThat(history.getHistoryCount()).isEqualTo(2);

    }
@@ -141,11 +141,11 @@ public class NotificationHistoryTest { 
        history.addNotificationsToWrite(secondHistory);



        assertThat(history.getNotificationsToWrite().size()).isEqualTo(5);

        assertThat(history.getNotificationsToWrite().get(0)).isSameAs(n3);

        assertThat(history.getNotificationsToWrite().get(1)).isSameAs(n);

        assertThat(history.getNotificationsToWrite().get(2)).isSameAs(n4);

        assertThat(history.getNotificationsToWrite().get(3)).isSameAs(n2);

        assertThat(history.getNotificationsToWrite().get(4)).isSameAs(n5);

        assertThat(history.getNotificationsToWrite().get(0)).isSameInstanceAs(n3);

        assertThat(history.getNotificationsToWrite().get(1)).isSameInstanceAs(n);

        assertThat(history.getNotificationsToWrite().get(2)).isSameInstanceAs(n4);

        assertThat(history.getNotificationsToWrite().get(3)).isSameInstanceAs(n2);

        assertThat(history.getNotificationsToWrite().get(4)).isSameInstanceAs(n5);

        assertThat(history.getHistoryCount()).isEqualTo(5);



        assertThat(history.getPooledStringsToWrite()).asList().contains(n2.getChannelName());

core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ public class CompoundFormulaTest { 
                        CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2));



        assertThat(compoundFormula.getConnector()).isEqualTo(CompoundFormula.AND);

        assertThat(compoundFormula.getFormulas()).containsAllOf(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2);

        assertThat(compoundFormula.getFormulas())

                .containsAtLeast(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2);

    }



    @Test

core/tests/coretests/src/android/content/pm/parsing/result/ParseInputAndResultTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class ParseInputAndResultTest { 
        assertError(result)

        assertThat(result.errorCode).isEqualTo(errorCode)

        assertThat(result.errorMessage).isEqualTo(errorMessage)

        assertThat(result.exception).isSameAs(exception)

        assertThat(result.exception).isSameInstanceAs(exception)

    }



    @Test
@@ -125,13 +125,13 @@ class ParseInputAndResultTest { 
        assertError(result)

        assertThat(result.errorCode).isEqualTo(errorCode)

        assertThat(result.errorMessage).isEqualTo(errorMessage)

        assertThat(result.exception).isSameAs(exception)

        assertThat(result.exception).isSameInstanceAs(exception)



        val carriedResult = input.error<Int>(result)

        assertError(carriedResult)

        assertThat(carriedResult.errorCode).isEqualTo(errorCode)

        assertThat(carriedResult.errorMessage).isEqualTo(errorMessage)

        assertThat(carriedResult.exception).isSameAs(exception)

        assertThat(carriedResult.exception).isSameInstanceAs(exception)

    }



    @Test
@@ -259,7 +259,7 @@ class ParseInputAndResultTest { 
    private fun assertSuccess(expected: Any? = null, result: ParseResult<*>) {

        assertThat(result.isError).isFalse()

        assertThat(result.isSuccess).isTrue()

        assertThat(result.result).isSameAs(expected)

        assertThat(result.result).isSameInstanceAs(expected)

        assertThat(result.errorCode).isEqualTo(PackageManager.INSTALL_SUCCEEDED)

        assertThat(result.errorMessage).isNull()

        assertThat(result.exception).isNull()

core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public class TextClassificationManagerTest { 


    @Test

    public void testGetLocalTextClassifier() {

        assertThat(mTcm.getTextClassifier(TextClassifier.LOCAL)).isSameAs(TextClassifier.NO_OP);

        assertThat(mTcm.getTextClassifier(TextClassifier.LOCAL))

                .isSameInstanceAs(TextClassifier.NO_OP);

    }



    @Test