From f04cf12caa5dca88dd340075543293b2cf599fe5 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 12 Jul 2010 20:25:35 -0700
Subject: [PATCH] ... and fixed up astrid 2 to 3 upgrade tests

---
 .../service/Astrid2To3UpgradeHelper.java      | 34 +++++++++++--------
 .../upgrade/Astrid2To3UpgradeTests.java       |  4 ++-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
index a64800992..3fe0e39cf 100644
--- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
+++ b/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();
-                rrule.setInterval(repeatInfo.getValue());
-                switch(repeatInfo.getInterval()) {
-                case DAYS:
-                    rrule.setFreq(Frequency.DAILY);
-                    break;
-                case WEEKS:
-                    rrule.setFreq(Frequency.WEEKLY);
-                    break;
-                case MONTHS:
-                    rrule.setFreq(Frequency.MONTHLY);
-                    break;
-                case HOURS:
-                    rrule.setFreq(Frequency.HOURLY);
+                if(repeatInfo == null)
+                    data.model.setValue(property, "");
+                else {
+                    RRule rrule = new RRule();
+                    rrule.setInterval(repeatInfo.getValue());
+                    switch(repeatInfo.getInterval()) {
+                    case DAYS:
+                        rrule.setFreq(Frequency.DAILY);
+                        break;
+                    case WEEKS:
+                        rrule.setFreq(Frequency.WEEKLY);
+                        break;
+                    case MONTHS:
+                        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);
             }
diff --git a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
index 02b338fa1..dec77cbb2 100644
--- a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
+++ b/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();