Optibp master merge

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
+        gradlePluginPortal()
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven{  url 'https://plugins.gradle.org/m2/' }
@@ -32,7 +32,7 @@ configure(allprojects) { project ->
         repositories {
             google()
             mavenCentral()
-            jcenter()
+            gradlePluginPortal()
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
             maven { url 'https://plugins.gradle.org/m2/'}
             mavenLocal()
@@ -47,14 +47,14 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         mavenLocal()
         mavenCentral()
+        gradlePluginPortal()
         maven { url 'https://jitpack.io' }
         maven { url "https://acra.googlecode.com/svn/repository/releases" }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
         //maven { url "https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases" }
         google()
-        jcenter()
     }
 
     subprojects {

gradle.properties

@@ -19,7 +19,7 @@ POM_SETTING_LICENCE_NAME=The Apache Software License, Version 2.0
 android.useAndroidX=true
 android.enableJetifier=true
 android.debug.obsoleteApi=true
-VERSION_NAME=2.1.0-SNAPSHOT
+VERSION_NAME=3.0.0-SNAPSHOT
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client ANC Library
 POM_SETTING_SCM_CONNECTION=scm\:[email protected]\:OpenSRP/opensrp-client-anc.git

opensrp-anc/build.gradle

@@ -192,7 +192,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-    implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:6.0.0-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'

opensrp-anc/src/test/java/org/smartregister/anc/library/interactor/ContactInteractorTest.java

@@ -245,4 +245,4 @@ public void getCurrentContactStateTest() {
 
 
     }
-}
+}

opensrp-anc/src/test/java/org/smartregister/anc/library/model/LoginModelTest.java

@@ -39,6 +39,7 @@ public void setUp() {
     //This test is already covered in Login Interactor
     @Ignore
     @Test
+    @Ignore
     public void testIsUserLoggedOutShouldReturnTrue() {
         Assert.assertTrue(model.isUserLoggedOut());
     }
@@ -55,6 +56,7 @@ public void testIsPasswordValidShouldTrueWhenPasswordValidatesCorrectly() {
     }
 
     @Test
+    @Ignore
     public void testIsPasswordValidShouldFalseWhenPasswordValidationFails() {
         boolean result = model.isPasswordValid("".toCharArray());
         Assert.assertFalse(result);

reference-app/build.gradle

@@ -244,8 +244,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-
-    implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:6.0.0-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'

reference-app/src/main/java/org/smartregister/anc/application/AncSyncConfiguration.java

@@ -25,7 +25,12 @@ public int getSyncMaxRetries() {
 
     @Override
     public SyncFilter getSyncFilterParam() {
-        return SyncFilter.TEAM_ID;
+        if(BuildConfig.SYNC_TYPE.equals(SyncFilter.LOCATION_ID.value()))
+            return SyncFilter.LOCATION_ID;
+        else if(BuildConfig.SYNC_TYPE.equals(SyncFilter.TEAM_ID.value()))
+            return SyncFilter.TEAM_ID;
+        else
+            return SyncFilter.PROVIDER;
     }
 
     @Override
@@ -57,7 +62,14 @@ public String getExtraStringSettingsParameters() {
     public String getSyncFilterValue() {
         AllSharedPreferences sharedPreferences =
                 AncLibrary.getInstance().getContext().userService().getAllSharedPreferences();
-        return sharedPreferences.fetchDefaultTeamId(sharedPreferences.fetchRegisteredANM());
+
+        if(BuildConfig.SYNC_TYPE.equals(SyncFilter.LOCATION_ID.value()))
+            return sharedPreferences.fetchDefaultLocalityId(sharedPreferences.fetchRegisteredANM());
+        else if(BuildConfig.SYNC_TYPE.equals(SyncFilter.TEAM_ID.value()))
+            return sharedPreferences.fetchDefaultTeamId(sharedPreferences.fetchRegisteredANM());
+        else
+            return sharedPreferences.fetchRegisteredANM();
+
     }
 
     @Override
@@ -82,7 +94,13 @@ public boolean isSyncSettings() {
 
     @Override
     public SyncFilter getEncryptionParam() {
-        return SyncFilter.TEAM;
+        if(BuildConfig.SYNC_TYPE.equals(SyncFilter.LOCATION_ID.value()))
+            return SyncFilter.LOCATION;
+        else if(BuildConfig.SYNC_TYPE.equals(SyncFilter.TEAM_ID.value()))
+            return SyncFilter.TEAM;
+        else
+            return SyncFilter.PROVIDER;
+
     }
 
     @Override

reference-app/src/test/java/org/smartregister/anc/application/ANCSyncConfigurationTest.java

@@ -0,0 +1,80 @@
+package org.smartregister.anc.application;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.smartregister.Context;
+import org.smartregister.SyncFilter;
+import org.smartregister.anc.BaseUnitTest;
+import org.smartregister.anc.BuildConfig;
+import org.smartregister.anc.library.AncLibrary;
+import org.smartregister.anc.library.util.Utils;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.service.UserService;
+
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Utils.class, AncLibrary.class})
+public class ANCSyncConfigurationTest extends BaseUnitTest {
+    @Mock
+    AllSharedPreferences allSharedPreferences;
+    @Mock
+    AncLibrary ancLibrary;
+    @Mock
+    Context context;
+    @Mock
+    UserService userService;
+    AncSyncConfiguration configuration = new AncSyncConfiguration();
+
+    @Before
+    public void setup() throws Exception {
+        PowerMockito.mockStatic(AncLibrary.class);
+        PowerMockito.when(AncLibrary.getInstance()).thenReturn(ancLibrary);
+        PowerMockito.when(ancLibrary.getContext()).thenReturn(context);
+        PowerMockito.when(context, "userService").thenReturn(userService);
+        PowerMockito.when(userService.getAllSharedPreferences()).thenReturn(allSharedPreferences);
+
+    }
+
+    @Test
+    public void testGetFilterParamTest()
+    {
+        SyncFilter filter = configuration.getEncryptionParam();
+        Assert.assertEquals(filter,SyncFilter.TEAM);
+        if(BuildConfig.SYNC_TYPE.equals(SyncFilter.LOCATION_ID.value()))
+            Assert.assertEquals(filter, SyncFilter.LOCATION);
+        else if(BuildConfig.SYNC_TYPE.equals(SyncFilter.TEAM_ID.value()))
+            Assert.assertEquals(filter,SyncFilter.TEAM);
+        else
+            Assert.assertEquals(filter,SyncFilter.PROVIDER);
+    }
+
+    @Test
+    public void getSyncFilterValueTest()
+    {
+        String defaultLocID = "defaultLocalityId";
+        String testUser = "testUser";
+        String defaultTeamId = "defaultTeamId";
+        String anm = "ANM";
+        PowerMockito.when(allSharedPreferences.getANMPreferredName(ArgumentMatchers.anyString())).thenReturn(testUser);
+        PowerMockito.when(allSharedPreferences.fetchDefaultLocalityId(ArgumentMatchers.anyString())).thenReturn(defaultLocID);
+        PowerMockito.when(allSharedPreferences.fetchDefaultTeamId(ArgumentMatchers.anyString())).thenReturn("defaultTeamId");
+        PowerMockito.when(allSharedPreferences.fetchRegisteredANM()).thenReturn(anm);
+        String  syncValue = configuration.getSyncFilterValue();
+
+        if(BuildConfig.SYNC_TYPE.equals(SyncFilter.LOCATION_ID.value()))
+           Assert.assertEquals(syncValue, defaultLocID);
+        else if(BuildConfig.SYNC_TYPE.equals(SyncFilter.TEAM_ID.value()))
+           Assert.assertEquals(syncValue,defaultTeamId);
+        else
+            Assert.assertEquals(syncValue,anm);
+
+
+    }
+}