diff options
author | Maurice Lam <yukl@google.com> | 2018-06-08 18:33:47 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2018-06-08 18:33:47 -0700 |
commit | 1d05333434b4e0f009fbce9a22e8e31521f86cad (patch) | |
tree | f476e69aa3f25619e65b6b96a6c1b71bf0dc96bf /library | |
parent | a1df48d7dcba9a30aaacce833b9891b660ce4246 (diff) | |
download | setupwizard-1d05333434b4e0f009fbce9a22e8e31521f86cad.tar.gz |
Fix Partner.getText
Test: ./gradlew test
Bug: 109781942
Change-Id: I06c3be06def30803e5dda3069686f0ff510b804d
Diffstat (limited to 'library')
-rw-r--r-- | library/main/src/com/android/setupwizardlib/util/Partner.java | 2 | ||||
-rw-r--r-- | library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/library/main/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java index f3e07aa..9eaedc3 100644 --- a/library/main/src/com/android/setupwizardlib/util/Partner.java +++ b/library/main/src/com/android/setupwizardlib/util/Partner.java @@ -92,7 +92,7 @@ public class Partner { */ public static CharSequence getText(Context context, @StringRes int id) { final ResourceEntry entry = getResourceEntry(context, id); - return entry.resources.getText(id); + return entry.resources.getText(entry.id); } /** diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java index f8e71be..2285cd5 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java @@ -16,6 +16,8 @@ package com.android.setupwizardlib.util; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -146,6 +148,19 @@ public class PartnerTest { } @Test + public void getText_shouldReturnPartnerValueIfPresent() { + final CharSequence expectedPartnerText = "partner"; + doReturn(12345).when(mPartnerResources) + .getIdentifier(eq("suw_next_button_label"), eq("string"), anyString()); + doReturn(expectedPartnerText).when(mPartnerResources).getText(eq(12345)); + mPackageManager.addResolveInfoForIntent( + new Intent(ACTION_PARTNER_CUSTOMIZATION), + Collections.singletonList(createResolveInfo("test.partner.package", true, true))); + final CharSequence partnerText = Partner.getText(mContext, R.string.suw_next_button_label); + assertThat(partnerText).isEqualTo(expectedPartnerText); + } + + @Test public void testLoadDefaultValue() { mPackageManager.addResolveInfoForIntent( new Intent(ACTION_PARTNER_CUSTOMIZATION), |