Skip to content

Commit e50fda6

Browse files
authored
Merge pull request #522 from OpenSRP/allow-access-to-shared-preferences-from-allsettings
Allow access to shared preferences from AllSettings
2 parents 580d924 + 91f5d6e commit e50fda6

File tree

3 files changed

+50
-1
lines changed

3 files changed

+50
-1
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=1.10.8-SNAPSHOT
1+
VERSION_NAME=1.11.0-SNAPSHOT
22
VERSION_CODE=1
33
GROUP=org.smartregister
44
POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

opensrp-app/src/main/java/org/smartregister/repository/AllSettings.java

+19
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,23 @@ public int getUnsyncedSettingsCount() {
116116
return settingsRepository.queryUnsyncedSettingsCount();
117117
}
118118

119+
public String fetchRegisteredANM() {
120+
return preferences.fetchRegisteredANM();
121+
}
122+
123+
public String fetchDefaultTeamId(String username) {
124+
return preferences.fetchDefaultTeamId(username);
125+
}
126+
127+
public String fetchDefaultTeam(String username) {
128+
return preferences.fetchDefaultTeam(username);
129+
}
130+
131+
public String fetchDefaultLocalityId(String username) {
132+
return preferences.fetchDefaultLocalityId(username);
133+
}
134+
135+
public AllSharedPreferences getPreferences() {
136+
return preferences;
137+
}
119138
}

opensrp-app/src/test/java/org/smartregister/repository/AllSettingsTest.java

+30
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import static org.junit.Assert.assertEquals;
1818
import static org.mockito.ArgumentMatchers.any;
19+
import static org.mockito.ArgumentMatchers.anyString;
1920
import static org.mockito.ArgumentMatchers.eq;
2021
import static org.mockito.Mockito.doReturn;
2122
import static org.mockito.Mockito.spy;
@@ -234,4 +235,33 @@ public void testGetUnsyncedSettings() {
234235
Assert.assertEquals("testUnsyncedKey", settings.get(0).getKey());
235236
Assert.assertEquals("testUnsyncedValue", settings.get(0).getValue());
236237
}
238+
239+
@Test
240+
public void testGetPreferences() {
241+
assertEquals(allSharedPreferences, allSettings.getPreferences());
242+
}
243+
244+
@Test
245+
public void testFetchRegisteredANMShouldReturnCorrectProvider() {
246+
doReturn("provider").when(allSharedPreferences).fetchRegisteredANM();
247+
assertEquals("provider", allSettings.fetchRegisteredANM());
248+
}
249+
250+
@Test
251+
public void testFetchDefaultTeamIdShouldReturnCorrectTeamId() {
252+
doReturn("team-id").when(allSharedPreferences).fetchDefaultTeamId(anyString());
253+
assertEquals("team-id", allSettings.fetchDefaultTeamId("user-name"));
254+
}
255+
256+
@Test
257+
public void testFetchDefaultTeamShouldReturnCorrectTeam() {
258+
doReturn("team").when(allSharedPreferences).fetchDefaultTeam(anyString());
259+
assertEquals("team", allSettings.fetchDefaultTeam("user-name"));
260+
}
261+
262+
@Test
263+
public void testFetchDefaultLocalityIdShouldReturnCorrectLocalityId() {
264+
doReturn("locality").when(allSharedPreferences).fetchDefaultLocalityId(anyString());
265+
assertEquals("locality", allSettings.fetchDefaultLocalityId("user-name"));
266+
}
237267
}

0 commit comments

Comments
 (0)