Fixed Failing Tests - Updated Observables

opensrp · May 13, 2019 · 3d54245 · 3d54245
1 parent 619d267
commit 3d54245
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/opensrp-chw/release/opensrp-chw-release-v0.1.4.apk b/opensrp-chw/release/opensrp-chw-release-v0.1.4.apk
diff --git a/opensrp-chw/release/output.json b/opensrp-chw/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.4","enabled":true,"outputFile":"opensrp-chw-release.apk","fullName":"release","baseName":"release"},"path":"opensrp-chw-release.apk","properties":{}}]
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/interactor/FamilyInteractor.java b/opensrp-chw/src/main/java/org/smartregister/chw/interactor/FamilyInteractor.java
@@ -14,6 +14,7 @@
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
+import timber.log.Timber;
 
 public class FamilyInteractor {
 
@@ -23,23 +24,31 @@ public static Observable<String> updateFamilyDueStatus(final Context context, fi
             public void subscribe(ObservableEmitter<String> e) throws Exception {
                 ImmunizationState familyImmunizationState = ImmunizationState.NO_ALERT;
                 String query = ChildUtils.getChildListByFamilyId(org.smartregister.chw.util.Constants.TABLE_NAME.CHILD, familyId);
-                Cursor cursor = org.smartregister.family.util.Utils.context().commonrepository(org.smartregister.chw.util.Constants.TABLE_NAME.CHILD).queryTable(query);
-                if (cursor != null && cursor.moveToFirst()) {
-                    do {
-                        switch (getChildStatus(context, childId, cursor)) {
-                            case DUE:
-                                if (familyImmunizationState != ImmunizationState.OVERDUE) {
-                                    familyImmunizationState = ImmunizationState.DUE;
-                                }
-                                break;
-                            case OVERDUE:
-                                familyImmunizationState = ImmunizationState.OVERDUE;
-                                break;
-                            default:
-                                break;
-                        }
-                    } while (cursor.moveToNext());
-                    cursor.close();
+                Cursor cursor = null;
+                try {
+                    cursor = org.smartregister.family.util.Utils.context().commonrepository(org.smartregister.chw.util.Constants.TABLE_NAME.CHILD).queryTable(query);
+                    if (cursor != null && cursor.moveToFirst()) {
+                        do {
+                            switch (getChildStatus(context, childId, cursor)) {
+                                case DUE:
+                                    if (familyImmunizationState != ImmunizationState.OVERDUE) {
+                                        familyImmunizationState = ImmunizationState.DUE;
+                                    }
+                                    break;
+                                case OVERDUE:
+                                    familyImmunizationState = ImmunizationState.OVERDUE;
+                                    break;
+                                default:
+                                    break;
+                            }
+                        } while (cursor.moveToNext());
+                        cursor.close();
+                    }
+                } catch (Exception ex) {
+                    Timber.e(ex.toString());
+                } finally {
+                    if (cursor != null)
+                        cursor.close();
                 }
 
                 e.onNext(toStringFamilyState(familyImmunizationState));

diff --git a/opensrp-chw/src/test/java/org/smartregister/chw/application/ChwApplicationTest.java b/opensrp-chw/src/test/java/org/smartregister/chw/application/ChwApplicationTest.java
@@ -3,12 +3,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.smartregister.chw.BaseUnitTest;
-import org.smartregister.reporting.ReportingLibrary;
+import org.smartregister.immunization.ImmunizationLibrary;
 
 public class ChwApplicationTest extends BaseUnitTest {
 
     @Test
-    public void reportingLibraryIsInitialisedOnStart() {
-        Assert.assertNotNull(ReportingLibrary.getInstance());
+    public void immunizationLibraryIsInitialisedOnStart() {
+        Assert.assertNotNull(ImmunizationLibrary.getInstance());
     }
 }
diff --git a/opensrp-chw/src/test/java/org/smartregister/chw/interactor/LoginInteractorTest.java b/opensrp-chw/src/test/java/org/smartregister/chw/interactor/LoginInteractorTest.java
@@ -12,7 +12,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.internal.verification.VerificationModeFactory;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -43,15 +42,17 @@ public void setUp() {
         loginInteractor = new LoginInteractor(loginPresenter);
     }
 
+
     @Test
     public void jobsAreScheduledOnScheduleJobsPeriodically() {
         PowerMockito.mockStatic(BaseJob.class);
         PowerMockito.mockStatic(JobManager.class);
         PowerMockito.when(JobManager.create(context)).thenReturn(jobManager);
         jobManager.addJobCreator(jobCreator);
         loginInteractor.scheduleJobsPeriodically();
-        PowerMockito.verifyStatic(BaseJob.class, Mockito.times(5));
+        PowerMockito.verifyStatic(BaseJob.class, Mockito.times(4));
         BaseJob.scheduleJob(ArgumentMatchers.anyString(), ArgumentMatchers.anyLong(), ArgumentMatchers.anyLong());
         PowerMockito.verifyNoMoreInteractions(BaseJob.class);
     }
+
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.4","enabled":true,"outputFile":"opensrp-chw-release.apk","fullName":"release","baseName":"release"},"path":"opensrp-chw-release.apk","properties":{}}]