Skip to content

Commit 21ba2cb

Browse files
authored
Normalize party name for display (#292)
* Normalize party name for display * Don't modify base party
1 parent 24e9312 commit 21ba2cb

3 files changed

Lines changed: 20 additions & 3 deletions

File tree

5calls/app/src/main/java/org/a5calls/android/a5calls/model/Contact.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,23 @@ public String getDescription(Resources res) {
9898
return "";
9999
}
100100
if (!TextUtils.isEmpty(party)) {
101+
String partyForDisplay = normalizeParty(party);
101102
if (!TextUtils.isEmpty(district)) {
102103
return res.getString(R.string.contact_political_details_all,
103-
name, party, state, district);
104+
name, partyForDisplay, state, district);
104105
}
105106
return res.getString(R.string.contact_political_details_party_state,
106-
name, party, state);
107+
name, partyForDisplay, state);
107108
}
108109
return res.getString(R.string.contact_political_details_state,
109110
name, state);
110111
}
112+
113+
// See 5calls-api's utils/party.go.
114+
private static String normalizeParty(String party) {
115+
if (TextUtils.equals(party, "Democratic")) {
116+
return "Democrat";
117+
}
118+
return party;
119+
}
111120
}

5calls/app/src/test/java/org/a5calls/android/a5calls/FakeJSONData.java

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

5calls/app/src/test/java/org/a5calls/android/a5calls/model/ContactsTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ public void testDescriptionGovernor() {
8181
assertEquals("Kathy Hochul is a Democrat from NY.", description);
8282
}
8383

84+
@Test
85+
public void testDescriptionNormalizeParty() {
86+
// Party listed as "Democratic" in JSON.
87+
List<Contact> contacts = getTestContacts();
88+
String description = contacts.get(2).getDescription(getApplicationContext().getResources());
89+
assertEquals("Chuck Schumer is a Democrat from NY.", description);
90+
}
91+
8492
@Test
8593
public void testDescriptionMissingFields() {
8694
Contact contact = TestModelUtils.createContact("contactId", "name");

0 commit comments

Comments
 (0)