... and fixed up astrid 2 to 3 upgrade tests

astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java

@@ -285,22 +285,26 @@ public class Astrid2To3UpgradeHelper {
 
             if(property == Task.RECURRENCE) {
                 RepeatInfo repeatInfo = RepeatInfo.fromSingleField(data.cursor.getInt(data.columnIndex));
-                RRule rrule = new RRule();
+                if(repeatInfo == null)
-                rrule.setInterval(repeatInfo.getValue());
+                    data.model.setValue(property, "");
-                switch(repeatInfo.getInterval()) {
+                else {
-                case DAYS:
+                    RRule rrule = new RRule();
-                    rrule.setFreq(Frequency.DAILY);
+                    rrule.setInterval(repeatInfo.getValue());
-                    break;
+                    switch(repeatInfo.getInterval()) {
-                case WEEKS:
+                    case DAYS:
-                    rrule.setFreq(Frequency.WEEKLY);
+                        rrule.setFreq(Frequency.DAILY);
-                    break;
+                        break;
-                case MONTHS:
+                    case WEEKS:
-                    rrule.setFreq(Frequency.MONTHLY);
+                        rrule.setFreq(Frequency.WEEKLY);
-                    break;
+                        break;
-                case HOURS:
+                    case MONTHS:
-                    rrule.setFreq(Frequency.HOURLY);
+                        rrule.setFreq(Frequency.MONTHLY);
+                        break;
+                    case HOURS:
+                        rrule.setFreq(Frequency.HOURLY);
+                    }
+                    data.model.setValue(property, rrule.toIcal());
                 }
-                data.model.setValue(property, rrule.toIcal());
             } else {
                 data.model.setValue(property, value);
             }

tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java

@@ -62,6 +62,8 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
         deleteDatabase(ALERTS_TEST);
         deleteDatabase(SYNC_TEST);
 
+        database.clear();
+
         alarmsDatabase = new AlarmDatabase();
         alarmsDatabase.clear();
     }
@@ -121,7 +123,6 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
         taskController.saveTask(griffey, false);
 
         TaskModelForEdit guti = new com.todoroo.astrid.legacy.data.task.TaskModelForEdit();
-        Date createdDate = new Date();
         guti.setName("franklin gutierrez");
         guti.setPreferredDueDate(new Date(System.currentTimeMillis() + 5000000L));
         guti.setImportance(Importance.LEVEL_1);
@@ -136,6 +137,7 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
 
         // upgrade
         upgrade2To3();
+        Date createdDate = new Date();
 
         // verify that data exists in our new table
         database.openForReading();