Fix Partner.getText
am: 466c50ab5c
Change-Id: I9be4de6d46052cd7860b0d87dcaf3ba8a4f1e454
This commit is contained in:
commit
c763434b46
|
@ -91,7 +91,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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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;
|
||||
|
@ -145,6 +147,19 @@ public class PartnerTest {
|
|||
expectedPartnerColor, foundColor);
|
||||
}
|
||||
|
||||
@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(
|
||||
|
|
Loading…
Reference in a new issue