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

Commit 52f97558 authored by Eduard Dumitrescul's avatar Eduard Dumitrescul
Browse files

Replace kotlin 'assert' with Truth 'assertThat' 

'assert' may not throw an AssertionError, depending on what flags are
enabled on the JVM.

This introduced misleading assertions and the possibility of failing
tests to display as passing.

Bug: 285532044

Test: atest ResolutionMechanismTest

Flag: TEST_ONLY

Change-Id: I0c58fd043d2d451049a93ea20f89525ae162e651
parent 5405dee1

services/tests/servicestests/src/com/android/server/devicepolicy/ResolutionMechanismTest.kt

+10 −10
Original line number Original line Diff line number Diff line
@@ -46,8 +46,8 @@ class ResolutionMechanismTest { 




        val resolvedPolicy = FlagUnion().resolve(adminPolicies)

        val resolvedPolicy = FlagUnion().resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        assert(resolvedPolicy?.resolvedPolicyValue == INT_POLICY_AB)

        assertThat(resolvedPolicy?.resolvedPolicyValue).isEqualTo(INT_POLICY_AB)

        assertThat(resolvedPolicy?.contributingAdmins)

        assertThat(resolvedPolicy?.contributingAdmins)

            .containsExactly(SYSTEM_ADMIN, DEVICE_OWNER_ADMIN)

            .containsExactly(SYSTEM_ADMIN, DEVICE_OWNER_ADMIN)

    }

    }
@@ -60,8 +60,8 @@ class ResolutionMechanismTest { 




        val resolvedPolicy = MostRecent<Integer>().resolve(adminPolicies)

        val resolvedPolicy = MostRecent<Integer>().resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        assert(resolvedPolicy?.resolvedPolicyValue == INT_POLICY_B)

        assertThat(resolvedPolicy?.resolvedPolicyValue).isEqualTo(INT_POLICY_B)

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(DEVICE_OWNER_ADMIN)

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(DEVICE_OWNER_ADMIN)

    }

    }
@@ -75,7 +75,7 @@ class ResolutionMechanismTest { 
            MostRestrictive<Boolean>(listOf(BooleanPolicyValue(false), BooleanPolicyValue(true)))

            MostRestrictive<Boolean>(listOf(BooleanPolicyValue(false), BooleanPolicyValue(true)))

                .resolve(adminPolicies)

                .resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        resolvedPolicy?.resolvedPolicyValue?.value?.let { assertFalse(it) }

        resolvedPolicy?.resolvedPolicyValue?.value?.let { assertFalse(it) }

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(SYSTEM_ADMIN)

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(SYSTEM_ADMIN)

    }

    }
@@ -91,7 +91,7 @@ class ResolutionMechanismTest { 
            MostRestrictive(listOf(BooleanPolicyValue(false), BooleanPolicyValue(true)))

            MostRestrictive(listOf(BooleanPolicyValue(false), BooleanPolicyValue(true)))

                .resolve(adminPolicies)

                .resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        resolvedPolicy?.resolvedPolicyValue?.value?.let { assertFalse(it) }

        resolvedPolicy?.resolvedPolicyValue?.value?.let { assertFalse(it) }

        assertThat(resolvedPolicy?.contributingAdmins)

        assertThat(resolvedPolicy?.contributingAdmins)

            .containsExactly(SYSTEM_ADMIN, DEVICE_ADMIN)

            .containsExactly(SYSTEM_ADMIN, DEVICE_ADMIN)
@@ -111,7 +111,7 @@ class ResolutionMechanismTest { 




        val resolvedPolicy = StringSetIntersection().resolve(adminPolicies)

        val resolvedPolicy = StringSetIntersection().resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        assertThat(resolvedPolicy?.resolvedPolicyValue?.value).containsExactly("package1")

        assertThat(resolvedPolicy?.resolvedPolicyValue?.value).containsExactly("package1")

        assertThat(resolvedPolicy?.contributingAdmins)

        assertThat(resolvedPolicy?.contributingAdmins)

            .containsExactly(SYSTEM_ADMIN, DEVICE_OWNER_ADMIN)

            .containsExactly(SYSTEM_ADMIN, DEVICE_OWNER_ADMIN)
@@ -131,7 +131,7 @@ class ResolutionMechanismTest { 




        val resolvedPolicy = PackageSetUnion().resolve(adminPolicies)

        val resolvedPolicy = PackageSetUnion().resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        assertThat(resolvedPolicy?.resolvedPolicyValue?.value)

        assertThat(resolvedPolicy?.resolvedPolicyValue?.value)

            .containsExactly("package1", "package2", "package3")

            .containsExactly("package1", "package2", "package3")

        assertThat(resolvedPolicy?.contributingAdmins)

        assertThat(resolvedPolicy?.contributingAdmins)
@@ -147,8 +147,8 @@ class ResolutionMechanismTest { 
        val resolvedPolicy =

        val resolvedPolicy =

            TopPriority<Integer>(listOf(EnforcingAdmin.DPC_AUTHORITY)).resolve(adminPolicies)

            TopPriority<Integer>(listOf(EnforcingAdmin.DPC_AUTHORITY)).resolve(adminPolicies)





        assert(resolvedPolicy != null)

        assertThat(resolvedPolicy).isNotNull()

        assert(resolvedPolicy?.resolvedPolicyValue == INT_POLICY_B)

        assertThat(resolvedPolicy?.resolvedPolicyValue).isEqualTo(INT_POLICY_B)

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(DEVICE_OWNER_ADMIN)

        assertThat(resolvedPolicy?.contributingAdmins).containsExactly(DEVICE_OWNER_ADMIN)

    }

    }