MM-1410 - Refactoring and fixes

infobip · Mar 15, 2017 · 99696cc · 99696cc
1 parent feebcf0
commit 99696cc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 25 deletions.
diff --git a/...-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusStorageTest.java b/...-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusStorageTest.java
@@ -1,9 +1,7 @@
 package org.infobip.mobile.messaging;
 
 import org.infobip.mobile.messaging.platform.Time;
-import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.tools.MobileMessagingTestCase;
-import org.infobip.mobile.messaging.util.PreferenceHelper;
 
 /**
  * @author sslavin
@@ -15,8 +13,7 @@ public class SeenStatusStorageTest extends MobileMessagingTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-
-        PreferenceHelper.saveString(context, MobileMessagingProperty.MESSAGE_STORE_CLASS, SQLiteMessageStore.class.getName());
+        enableMessageStoreForReceivedMessages();
     }
 
     public void test_shouldUpdateSeenTimestampInMessageStore() {

diff --git a/...d-sdk/src/androidTest/java/org/infobip/mobile/messaging/gcm/MobileMessageHandlerTest.java b/...d-sdk/src/androidTest/java/org/infobip/mobile/messaging/gcm/MobileMessageHandlerTest.java
@@ -2,13 +2,9 @@
 
 import org.infobip.mobile.messaging.Message;
 import org.infobip.mobile.messaging.MobileMessaging;
-import org.infobip.mobile.messaging.MobileMessagingCore;
-import org.infobip.mobile.messaging.MobileMessagingProperty;
 import org.infobip.mobile.messaging.geo.Geo;
 import org.infobip.mobile.messaging.storage.MessageStore;
-import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.tools.MobileMessagingTestCase;
-import org.infobip.mobile.messaging.util.PreferenceHelper;
 import org.mockito.Mockito;
 
 import java.util.List;
@@ -22,19 +18,15 @@ public class MobileMessageHandlerTest extends MobileMessagingTestCase {
 
     private MobileMessageHandler handler;
     private MessageStore commonStore;
-    private MessageStore geoStore;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        PreferenceHelper.saveString(context, MobileMessagingProperty.MESSAGE_STORE_CLASS, SQLiteMessageStore.class.getName());
+        enableMessageStoreForReceivedMessages();
 
         handler = new MobileMessageHandler(broadcaster);
         commonStore = MobileMessaging.getInstance(context).getMessageStore();
-        commonStore.deleteAll(context);
-        geoStore = MobileMessagingCore.getInstance(context).getMessageStoreForGeo();
-        geoStore.deleteAll(context);
     }
 
     public void test_shouldSaveGeoMessageToGeoStore() throws Exception {

diff --git a/...droid-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoAreasHandlerTests.java b/...droid-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoAreasHandlerTests.java
@@ -220,9 +220,9 @@ public void test_should_generate_messages_only_for_active_campaigns() throws Int
         // Given
         Area area = createArea("areaId1");
         Mockito.when(messageStore.findAll(Mockito.any(Context.class))).thenReturn(Arrays.asList(
-                createMessage(context,"signalingMessageId1", "campaignId1", false, area),
-                createMessage(context,"signalingMessageId2", "campaignId2", false, area),
-                createMessage(context,"signalingMessageId3", "campaignId3", false, area)));
+                createMessage(context,"signalingMessageId1", "campaignId1", true, area),
+                createMessage(context,"signalingMessageId2", "campaignId2", true, area),
+                createMessage(context,"signalingMessageId3", "campaignId3", true, area)));
         EventReportResponse response = new EventReportResponse();
         response.setSuspendedCampaignIds(Sets.newSet("campaignId1"));
         response.setFinishedCampaignIds(Sets.newSet("campaignId2"));

diff --git a/...ng-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoReporterTest.java b/...ng-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoReporterTest.java
@@ -9,7 +9,6 @@
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
 import org.infobip.mobile.messaging.mobile.geo.GeoReporter;
 import org.infobip.mobile.messaging.storage.MessageStore;
-import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.tools.MobileMessagingTestCase;
 import org.infobip.mobile.messaging.util.PreferenceHelper;
 import org.mockito.ArgumentCaptor;
@@ -41,7 +40,7 @@ protected void setUp() throws Exception {
         super.setUp();
 
         // Enable message store for notification messages
-        PreferenceHelper.saveString(context, MobileMessagingProperty.MESSAGE_STORE_CLASS, SQLiteMessageStore.class.getName());
+        enableMessageStoreForReceivedMessages();
 
         messageStore = MobileMessaging.getInstance(context).getMessageStore();
         geoReporter = new GeoReporter(context, broadcaster, MobileMessagingCore.getInstance(context).getStats());

diff --git a/...ing-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeofencingTest.java b/...ing-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeofencingTest.java
@@ -2,13 +2,10 @@
 
 import com.google.android.gms.location.Geofence;
 
-import org.infobip.mobile.messaging.MobileMessagingProperty;
 import org.infobip.mobile.messaging.api.support.Tuple;
 import org.infobip.mobile.messaging.platform.Time;
-import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.tools.MobileMessagingTestCase;
 import org.infobip.mobile.messaging.util.DateTimeUtil;
-import org.infobip.mobile.messaging.util.PreferenceHelper;
 
 import java.util.Date;
 import java.util.List;
@@ -28,7 +25,7 @@ protected void setUp() throws Exception {
 
         now = Time.now();
 
-        PreferenceHelper.saveString(context, MobileMessagingProperty.MESSAGE_STORE_CLASS, SQLiteMessageStore.class.getName());
+        enableMessageStoreForReceivedMessages();
         Geofencing.getInstance(context);
     }
 

diff --git a/...d-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/MobileMessageHandlerTest.java b/...d-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/MobileMessageHandlerTest.java
@@ -7,7 +7,6 @@
 import org.infobip.mobile.messaging.gcm.MobileMessageHandler;
 import org.infobip.mobile.messaging.platform.Time;
 import org.infobip.mobile.messaging.storage.MessageStore;
-import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.tools.MobileMessagingTestCase;
 import org.infobip.mobile.messaging.util.DateTimeUtil;
 import org.infobip.mobile.messaging.util.PreferenceHelper;
@@ -29,9 +28,8 @@ public class MobileMessageHandlerTest extends MobileMessagingTestCase {
     protected void setUp() throws Exception {
         super.setUp();
 
-        context = getInstrumentation().getContext();
+        enableMessageStoreForReceivedMessages();
 
-        PreferenceHelper.saveString(context, MobileMessagingProperty.MESSAGE_STORE_CLASS, SQLiteMessageStore.class.getName());
         PreferenceHelper.saveBoolean(context, MobileMessagingProperty.PUSH_REGISTRATION_ENABLED, true);
         PreferenceHelper.saveBoolean(context, MobileMessagingProperty.GEOFENCING_ACTIVATED, true);