Merge branch 'master' into issue-1734-save-button-not-supporting-mls

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.0.25-SNAPSHOT
+VERSION_NAME=2.0.26-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library

opensrp-chw-core/build.gradle

@@ -193,7 +193,7 @@ dependencies {
         exclude group: 'com.github.lecho', module: 'hellocharts-android'
     }
 
-    api('org.smartregister:opensrp-client-chw-anc:2.0.3-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-chw-anc:2.0.4-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'

opensrp-chw-core/src/test/java/org/smartregister/chw/core/activity/ReportSummaryActivityTest.java

@@ -0,0 +1,54 @@
+package org.smartregister.chw.core.activity;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.Robolectric;
+import org.robolectric.android.controller.ActivityController;
+import org.smartregister.Context;
+import org.smartregister.CoreLibrary;
+import org.smartregister.chw.core.BaseUnitTest;
+
+public class ReportSummaryActivityTest extends BaseUnitTest {
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    private ReportSummaryActivity activity;
+    private ActivityController<ReportSummaryActivity> controller;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        Context context = Context.getInstance();
+        CoreLibrary.init(context);
+
+        //Auto login by default
+        context.session().start(context.session().lengthInMilliseconds());
+        controller = Robolectric.buildActivity(ReportSummaryActivity.class).create().start().resume();
+        activity = controller.get();
+    }
+
+    @Test
+    public void testOnBackPressed() {
+        ReportSummaryActivity spyActivity = Mockito.spy(activity);
+        spyActivity.onBackPressed();
+        Mockito.verify(spyActivity).onBackPressed();
+    }
+
+    @After
+    public void tearDown() {
+        try {
+            activity.finish();
+            controller.pause().stop().destroy(); //destroy controller if we can
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

opensrp-chw-core/src/test/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragmentTest.java

@@ -22,10 +22,10 @@
 import org.smartregister.Context;
 import org.smartregister.CoreLibrary;
 import org.smartregister.chw.core.BaseUnitTest;
+import org.smartregister.chw.core.contract.FamilyRemoveMemberContract;
+import org.smartregister.chw.core.presenter.CoreFamilyRemoveMemberPresenter;
 import org.smartregister.commonregistry.CommonRepository;
 import org.smartregister.cursoradapter.RecyclerViewPaginatedAdapter;
-import org.smartregister.family.contract.FamilyProfileMemberContract;
-import org.smartregister.family.presenter.BaseFamilyProfileMemberPresenter;
 import org.smartregister.family.util.DBConstants;
 import org.smartregister.receiver.SyncStatusBroadcastReceiver;
 
@@ -53,36 +53,37 @@ public class CoreFamilyRemoveMemberFragmentTest extends BaseUnitTest {
     private ArgumentCaptor<RecyclerViewPaginatedAdapter> adapterArgumentCaptor;
     private CoreFamilyRemoveMemberFragment familyProfileMemberFragment;
 
-    private BaseFamilyProfileMemberPresenter familyProfileMemberPresenter;
+    private CoreFamilyRemoveMemberPresenter familyProfileMemberPresenter;
 
     @Before
     public void setUp() throws Exception {
         Context.bindtypes = new ArrayList<>();
         familyProfileMemberFragment = Mockito.mock(CoreFamilyRemoveMemberFragment.class, Mockito.CALLS_REAL_METHODS);
+
+        activity = Robolectric.buildActivity(AppCompatActivity.class).create().start().get();
         CoreLibrary.init(context);
         when(context.commonrepository(anyString())).thenReturn(commonRepository);
-        familyProfileMemberPresenter = new BaseFamilyProfileMemberPresenter(Mockito.mock(FamilyProfileMemberContract.View.class),
-                Mockito.mock(FamilyProfileMemberContract.Model.class), null, "familybaseid", "Head", "Caregiver");
+        familyProfileMemberPresenter = new CoreFamilyRemoveMemberPresenter(Mockito.mock(FamilyRemoveMemberContract.View.class),
+                Mockito.mock(FamilyRemoveMemberContract.Model.class), null, "familybaseid", "Head", "Caregiver");
         CoreLibrary.init(context);
         when(context.commonrepository(anyString())).thenReturn(commonRepository);
         activityController = Robolectric.buildActivity(AppCompatActivity.class).create().resume();
-        activity = activityController.get();
         Context.bindtypes = new ArrayList<>();
         Whitebox.setInternalState(familyProfileMemberFragment, "searchView", new EditText(activity));
         Whitebox.setInternalState(familyProfileMemberFragment, "clientsView", clientsView);
         Whitebox.setInternalState(familyProfileMemberFragment, "presenter", familyProfileMemberPresenter);
-        activity.setContentView(org.smartregister.family.R.layout.activity_family_profile);
         SyncStatusBroadcastReceiver.init(activity);
     }
 
     @Test
     public void getMainCondition() {
-        assertEquals(familyProfileMemberFragment.getMainCondition(), String.format(" %s = '%s' and %s is null ", DBConstants.KEY.OBJECT_RELATIONAL_ID, "familybaseid", DBConstants.KEY.DATE_REMOVED));
+        assertEquals(familyProfileMemberFragment.getMainCondition(), String.format(" %s = '%s' and %s is null and %s is null ", DBConstants.KEY.OBJECT_RELATIONAL_ID, "familybaseid", DBConstants.KEY.DATE_REMOVED, DBConstants.KEY.DOD));
+
     }
 
     @Test
     public void getDefaultSortQuery() {
-        assertEquals(familyProfileMemberFragment.getDefaultSortQuery(), DBConstants.KEY.DOD + ", " + DBConstants.KEY.DOB + " ASC ");
+        assertEquals(familyProfileMemberFragment.getDefaultSortQuery(), " " + DBConstants.KEY.DOB + " ASC ");
     }
 
     @Test
@@ -92,6 +93,14 @@ public void setFamilyHead() {
         assertEquals(familyHead, familyProfileMemberPresenter.getFamilyHead());
     }
 
+    @Test
+    public void testInitializePresenter() {
+        String familyHead = "family_ head";
+        String primaryCareGiver = "mrs caregiver";
+        familyProfileMemberFragment.setPresenter(familyHead, primaryCareGiver);
+        assertNotNull(familyProfileMemberFragment.getPresenter());
+    }
+
     @Test
     public void setPrimaryCaregiver() {
         String primaryCareGiver = "mrs Caregiver";