Skip to content

Commit 9c9e5ce

Browse files
committed
Fix failing tests
1 parent b6c592a commit 9c9e5ce

File tree

5 files changed

+28
-11
lines changed

5 files changed

+28
-11
lines changed

opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PatientRepository.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ public static Map<String, String> getWomanProfileDetails(String baseEntityId) {
5656
detailsMap = new HashMap<>();
5757
for (int count = 0; count < projection.length; count++) {
5858
String columnName = cursor.getColumnName(count);
59-
String columnValue = cursor.getString(cursor.getColumnIndex(columnName));
60-
if(columnName.equals(DBConstantsUtils.KeyUtils.LAST_NAME) && StringUtils.isBlank(columnValue))
61-
columnValue = "";
62-
detailsMap.put(columnName, columnValue);
59+
if (columnName != null) {
60+
String columnValue = cursor.getString(cursor.getColumnIndex(columnName));
61+
if (columnName.equals(DBConstantsUtils.KeyUtils.LAST_NAME) && StringUtils.isBlank(columnValue))
62+
columnValue = "";
63+
detailsMap.put(columnName, columnValue);
64+
}
6365
}
6466
}
6567
return detailsMap;

opensrp-anc/src/test/java/org/smartregister/anc/library/repository/ContactTasksRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ private Task getTask() {
8888
public void testSaveTasks() throws Exception {
8989
ContactTasksRepository contactTasksRepository = PowerMockito.spy(new ContactTasksRepository());
9090
PowerMockito.mockStatic(ContentValues.class);
91-
9291
DrishtiApplication drishtiApplication = Mockito.mock(DrishtiApplication.class);
9392
ReflectionHelpers.setStaticField(DrishtiApplication.class, "mInstance", drishtiApplication);
9493

@@ -98,6 +97,7 @@ public void testSaveTasks() throws Exception {
9897
task.setId(null);
9998
ContentValues contentValues = Whitebox.invokeMethod(contactTasksRepository, "createValuesFor", task);
10099

100+
PowerMockito.when(contactTasksRepository.getReadableDatabase()).thenReturn(sqLiteDatabase);
101101
PowerMockito.when(contactTasksRepository.getWritableDatabase().insert(TABLE_NAME, null, contentValues)).thenReturn((long) 0);
102102
Assert.assertFalse(contactTasksRepository.saveOrUpdateTasks(task));
103103
}

opensrp-anc/src/test/java/org/smartregister/anc/library/sync/BaseAncClientProcessorForJavaTest.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@
99
import org.junit.Assert;
1010
import org.junit.Before;
1111
import org.junit.Test;
12+
import org.junit.runner.RunWith;
1213
import org.mockito.ArgumentMatchers;
1314
import org.mockito.Mock;
1415
import org.mockito.Mockito;
1516
import org.mockito.MockitoAnnotations;
17+
import org.powermock.api.mockito.PowerMockito;
18+
import org.powermock.core.classloader.annotations.PrepareForTest;
19+
import org.powermock.modules.junit4.PowerMockRunner;
1620
import org.robolectric.RuntimeEnvironment;
21+
import org.smartregister.Context;
22+
import org.smartregister.CoreLibrary;
1723
import org.smartregister.anc.library.activity.BaseUnitTest;
1824
import org.smartregister.anc.library.repository.ContactTasksRepository;
1925
import org.smartregister.anc.library.util.ConstantsUtils;
@@ -27,7 +33,8 @@
2733
import java.util.List;
2834
import java.util.Map;
2935

30-
36+
@RunWith(PowerMockRunner.class)
37+
@PrepareForTest({CoreLibrary.class})
3138
public class BaseAncClientProcessorForJavaTest extends BaseUnitTest {
3239
private BaseAncClientProcessorForJava baseAncClientProcessorForJava;
3340

@@ -73,6 +80,11 @@ public void testProcessClientWithEmptyEventList() throws Exception {
7380

7481
@Test
7582
public void testProcessClient() throws Exception {
83+
CoreLibrary coreLibrary = PowerMockito.mock(CoreLibrary.class);
84+
PowerMockito.mockStatic(CoreLibrary.class);
85+
PowerMockito.when(CoreLibrary.getInstance()).thenReturn(coreLibrary);
86+
Assert.assertNotNull(coreLibrary);
87+
7688
List<EventClient> eventClients = new ArrayList<>();
7789
Map<String, String> details = getDetailsMap();
7890
Event event = getEvent(details);
@@ -99,13 +111,14 @@ public void testProcessClient() throws Exception {
99111
Mockito.doReturn(true).when(contactTasksRepositorySpy).saveOrUpdateTasks(null);
100112

101113
Mockito.doReturn(sqLiteDatabase).when(contactTasksRepositorySpy).getWritableDatabase();
114+
Mockito.doReturn(sqLiteDatabase).when(contactTasksRepositorySpy).getReadableDatabase();
102115
Mockito.doReturn((long) 3).when(sqLiteDatabase).insert(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.eq(new ContentValues()));
103116

104117
baseAncClientProcessorForJavaSpy.processClient(eventClients);
105118

106119
Mockito.verify(baseAncClientProcessorForJavaSpy, Mockito.times(1)).getDetailsRepository();
107-
Mockito.verify(baseAncClientProcessorForJavaSpy, Mockito.times(6)).getContactTasksRepository();
108-
Mockito.verify(contactTasksRepositorySpy, Mockito.times(6)).getWritableDatabase();
120+
Mockito.verify(baseAncClientProcessorForJavaSpy, Mockito.times(7)).getContactTasksRepository();
121+
Mockito.verify(contactTasksRepositorySpy, Mockito.times(7)).getWritableDatabase();
109122
}
110123

111124
@NotNull

opensrp-anc/src/test/java/org/smartregister/anc/library/util/ANCFormUtilsTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.smartregister.repository.Repository;
3232
import org.smartregister.view.activity.DrishtiApplication;
3333

34+
import java.util.ArrayList;
3435
import java.util.List;
3536

3637
import edu.emory.mathcs.backport.java.util.Arrays;
@@ -142,16 +143,16 @@ public void testRemoveKeyPrefix() {
142143

143144
@Test
144145
public void testGetListValues() {
145-
String actual = "one, two, three";
146+
String actual = "one,two,three";
146147
List<String> list = Arrays.asList(new String[]{"one", "two", "three"});
147148
String result = ANCFormUtils.getListValuesAsString(list);
148-
assertEquals(result, actual);
149+
assertEquals(actual, result);
149150
}
150151

151152
@Test
152153
public void testGetListValuesWithNullInput() {
153154
String actual = "";
154-
String result = ANCFormUtils.getListValuesAsString(null);
155+
String result = ANCFormUtils.getListValuesAsString(new ArrayList<String>());
155156
assertEquals(result, actual);
156157
}
157158

opensrp-anc/src/test/java/org/smartregister/anc/library/util/UtilsTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ public void testCreateExpansionPanelValues() throws Exception {
305305
public void testHasPendingRequiredFields() throws Exception {
306306
//Checks if there are required fields that don't have value
307307
JSONObject mainObject = getMainJsonObject("json_test_forms/test_checkbox_filter_json_form");
308+
ReflectionHelpers.setStaticField(AncLibrary.class, "instance", ancLibrary);
308309
Assert.assertTrue(hasPendingRequiredFields(mainObject));
309310
}
310311

0 commit comments

Comments
 (0)