Fixed blank message issue and fixed tests

Author: jmatsushita

src/main/java/com/apb/beacon/model/SMSSettings.java

@@ -29,15 +29,14 @@ public SMSSettings(List<String> phoneNumbers, String message) {
         this.message = message;
     }
 
-    public static void save(Context context, SMSSettings smsSettings) {
+    public static void saveContacts(Context context, SMSSettings smsSettings) {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor editor = settings.edit();
         int i = 0;
         for (String phoneNumber : smsSettings.phoneNumbers) {
             String validPhoneDigit = phoneNumber.replaceAll("[- ]", "");
             editor.putString(PHONE_NUMBER + i++, validPhoneDigit);
         }
-        editor.putString(SMS_MESSAGE, smsSettings.message);
         editor.commit();
     }
 

src/main/java/com/apb/beacon/sms/SetupContactsFragment.java

@@ -83,7 +83,7 @@ public void onClick(View v) {
                 Log.e(">>>>", "action button pressed");
                 SMSSettings newSMSSettings = getSMSSettingsFromView();
 
-                SMSSettings.save(activity, newSMSSettings);
+                SMSSettings.saveContacts(activity, newSMSSettings);
                 displaySettings(newSMSSettings);
 
                 String pageId = currentPage.getAction().get(0).getLink();

src/test/java/com/apb/beacon/alert/PanicMessageTest.java

@@ -55,7 +55,8 @@ public void setUp() {
         finerLocation = LocationTestUtil.location(LocationManager.NETWORK_PROVIDER, finerLatitude, finerLongitude, currentTimeMillis(), 10.0f);
 
         SMSSettings smsSettings = new SMSSettings(asList(mobile1, mobile2, mobile3), message);
-        SMSSettings.save(context, smsSettings);
+        SMSSettings.saveContacts(context, smsSettings);
+        SMSSettings.saveMessage(context, message);
     }
 
     @Test

src/test/java/com/apb/beacon/location/LocationUpdateReceiverTest.java

@@ -98,15 +98,15 @@ public void shouldReturnLocationWhichHasAlmostSameAccuracyAndRelativelyNew() {
     public void shouldReturnLocationFromSameProviderAndNotSignificantlyAccurateButRelativelyNew() {
         Location oldLocation = location(NETWORK_PROVIDER, 12.0, 20.0, currentTimeMillis(), LESS_ACCURATE);
         Location lessAccurateButNewLocation = location(NETWORK_PROVIDER, 12.0, 20.0, offsetCurrentTimeBy(10), VERY_LESS_ACCURATE);
-        Location diffProviderLocation = location(GPS_PROVIDER, 12.0, 20.0, offsetCurrentTimeBy(20), VERY_LESS_ACCURATE + 10.0f);
+        Location diffMoreAccurateProviderLocation = location(GPS_PROVIDER, 12.0, 20.0, offsetCurrentTimeBy(20), VERY_LESS_ACCURATE + 10.0f);
         Location significantlyLessAccurateLocation = location(NETWORK_PROVIDER, 13.0, 20.0, offsetCurrentTimeBy(10), SIGNIFICANTLY_LESS_ACCURATE);
 
         locationUpdateReceiver.onReceive(context, getIntent(oldLocation));
         locationUpdateReceiver.onReceive(context, getIntent(lessAccurateButNewLocation));
-        locationUpdateReceiver.onReceive(context, getIntent(diffProviderLocation));
+        locationUpdateReceiver.onReceive(context, getIntent(diffMoreAccurateProviderLocation));
         locationUpdateReceiver.onReceive(context, getIntent(significantlyLessAccurateLocation));
 
-        assertLocation(lessAccurateButNewLocation);
+        assertLocation(diffMoreAccurateProviderLocation);
     }
 
     private Intent getIntent(Location location) {

src/test/java/com/apb/beacon/model/SMSSettingsTest.java

@@ -30,7 +30,8 @@ public void shouldSaveAndRetrieveSMSSettings() throws Exception {
 
         SMSSettings smsSettings = new SMSSettings(expectedPhoneNumbers, expectedMessage);
 
-        SMSSettings.save(context, smsSettings);
+        SMSSettings.saveContacts(context, smsSettings);
+        SMSSettings.saveMessage(context, expectedMessage);
         SMSSettings retrievedSMSSettings = SMSSettings.retrieve(context);
 
         assertEquals(expectedMessage, retrievedSMSSettings.message());