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

Commit 69766612 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886

Change-Id: I6b0d8fe110983769365aad5369173ff6e23bb02e
parents 96dfbcc3 bcc49f1f

tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java

+0 −6
Original line number Diff line number Diff line
@@ -145,9 +145,6 @@ public class EnterprisePrivacyFeatureProviderImplTest { 


        SpannableStringBuilder disclosure = new SpannableStringBuilder();

        disclosure.append(mResources.getString(R.string.do_disclosure_generic));

        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));

        disclosure.append(mResources.getString(R.string.learn_more),

                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);

        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);

        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);

        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
@@ -155,9 +152,6 @@ public class EnterprisePrivacyFeatureProviderImplTest { 
        disclosure = new SpannableStringBuilder();

        disclosure.append(mResources.getString(R.string.do_disclosure_with_name,

                OWNER_ORGANIZATION));

        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));

        disclosure.append(mResources.getString(R.string.learn_more),

                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);

        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);

        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);

    }