Fix failing tests

Author: ndegwamartin

opensrp-app/src/main/java/org/smartregister/login/task/RemoteLoginTask.java

@@ -28,6 +28,7 @@
 import org.smartregister.view.contract.BaseLoginContract;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Locale;
 
 import timber.log.Timber;
@@ -117,7 +118,7 @@ protected LoginResponse doInBackground(Void... params) {
                     mAccountManager.setUserData(account, AccountHelper.INTENT_KEY.ACCOUNT_LOCAL_PASSWORD_SALT, userData.getString(AccountHelper.INTENT_KEY.ACCOUNT_LOCAL_PASSWORD_SALT));
                     mAccountManager.setUserData(account, AccountHelper.INTENT_KEY.ACCOUNT_NAME, userData.getString(AccountHelper.INTENT_KEY.ACCOUNT_NAME));
                     mAccountManager.setUserData(account, AccountHelper.INTENT_KEY.ACCOUNT_REFRESH_TOKEN, response.getRefreshToken());
-                    mAccountManager.setUserData(account,AccountHelper.INTENT_KEY.ACCOUNT_ROLES,user.getRoles().toString());
+                    mAccountManager.setUserData(account, AccountHelper.INTENT_KEY.ACCOUNT_ROLES, user.getRoles() != null ? user.getRoles().toString() : Collections.EMPTY_LIST.toString());
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         mAccountManager.notifyAccountAuthenticated(account);
                     }

opensrp-app/src/test/java/org/smartregister/login/interactor/BaseLoginInteractorTest.java

@@ -163,7 +163,7 @@ public void setUp() {
         when(view.getActivityContext()).thenReturn(activity);
 
         loginResponseData = new LoginResponseData();
-        loginResponseData.user = new User().withUsername(username);
+        loginResponseData.user = new User().withUsername(username).withRole("READ_ROLE").withRole("WRITE_ROLE").withRole("PROVIDER_ROLE");
         loginResponseData.time = new Time(new Date(), TimeZone.getTimeZone("Africa/Nairobi"));
 
         when(context.getHttpAgent()).thenReturn(httpAgent);

opensrp-app/src/test/java/org/smartregister/sync/intent/SyncIntentServiceTest.java

@@ -41,6 +41,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -493,14 +494,15 @@ public void testGetUrlResponseCreatesValidUrlWithExtraParamsUsingGET() {
         responseStatus.setDisplayValue(ResponseErrorStatus.malformed_url.name());
         Mockito.doReturn(new Response<>(responseStatus, null))
                 .when(httpAgent).fetch(stringArgumentCaptor.capture());
-
+        String removeParamKey = "some-other-param-to-remove";
         BaseSyncIntentService.RequestParamsBuilder builder = new BaseSyncIntentService.RequestParamsBuilder().configureSyncFilter("locationId", "location-1")
-                .addServerVersion(0).addEventPullLimit(250).addParam("region", "au-west").addParam("is_enabled", true).addParam("some-other-param", 85l);
+                .addServerVersion(0).addEventPullLimit(250).addParam("region", "au-west").addParam("is_enabled", true).addParam("some-other-param", 85l)
+                .addParam(removeParamKey, 745).removeParam(removeParamKey);
         syncIntentService.getUrlResponse("https://sample-stage.smartregister.org/opensrp/rest/event/sync", builder, syncConfiguration, false);
 
         String syncUrl = stringArgumentCaptor.getValue();
         assertEquals("https://sample-stage.smartregister.org/opensrp/rest/event/sync?locationId=location-1&serverVersion=0&limit=250&region=au-west&is_enabled=true&some-other-param=85", syncUrl);
-
+        assertTrue(syncIntentService.isEmptyToAdd());
     }
 
     @Test