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

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

@@ -285,6 +285,9 @@ public class Astrid2To3UpgradeHelper {
 
             if(property == Task.RECURRENCE) {
                 RepeatInfo repeatInfo = RepeatInfo.fromSingleField(data.cursor.getInt(data.columnIndex));
+                if(repeatInfo == null)
+                    data.model.setValue(property, "");
+                else {
                     RRule rrule = new RRule();
                     rrule.setInterval(repeatInfo.getValue());
                     switch(repeatInfo.getInterval()) {
@@ -301,6 +304,7 @@ public class Astrid2To3UpgradeHelper {
                         rrule.setFreq(Frequency.HOURLY);
                     }
                     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();