From 11565ba9b9e5d827f5d0668b74b67071a83d24e2 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 4 Feb 2013 16:54:50 -0800 Subject: [PATCH] Fixed bugs with sync migrator test --- .../actfm/sync/AstridNewSyncMigrator.java | 17 ++++++++--------- .../src/com/todoroo/astrid/dao/MetadataDao.java | 2 +- .../astrid/sync/AstridNewSyncMigrationTest.java | 6 ++++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java index 279bd90fb..98341d1d9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java @@ -37,7 +37,6 @@ import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.tags.TaskToTagMetadata; -import com.todoroo.astrid.utility.Constants; @SuppressWarnings("nls") public class AstridNewSyncMigrator { @@ -80,7 +79,7 @@ public class AstridNewSyncMigrator { for (noTagData.moveToFirst(); !noTagData.isAfterLast(); noTagData.moveToNext()) { tag.readFromCursor(noTagData); - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "CREATING TAG DATA " + tag.getValue(TaskToTagMetadata.TAG_NAME)); TagData newTagData = new TagData(); @@ -187,18 +186,18 @@ public class AstridNewSyncMigrator { m.readFromCursor(incompleteMetadata); boolean changes = false; - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "Incomplete linking task " + m.getValue(Metadata.TASK) + " to " + m.getValue(TaskToTagMetadata.TAG_NAME)); if (!m.containsNonNullValue(TaskToTagMetadata.TASK_UUID) || RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TASK_UUID))) { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "No task uuid"); updateTaskUuid(m); changes = true; } if (!m.containsNonNullValue(TaskToTagMetadata.TAG_UUID) || RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TAG_UUID))) { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "No tag uuid"); updateTagUuid(m); changes = true; @@ -262,11 +261,11 @@ public class AstridNewSyncMigrator { long taskId = m.getValue(Metadata.TASK); Task task = taskDao.fetch(taskId, Task.UUID); if (task != null) { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "Linking with task uuid " + task.getValue(Task.UUID)); m.setValue(TaskToTagMetadata.TASK_UUID, task.getValue(Task.UUID)); } else { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "Task not found, deleting link"); m.setValue(Metadata.DELETION_DATE, DateUtilities.now()); } @@ -276,11 +275,11 @@ public class AstridNewSyncMigrator { String tag = m.getValue(TaskToTagMetadata.TAG_NAME); TagData tagData = tagDataService.getTag(tag, TagData.UUID); if (tagData != null) { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "Linking with tag uuid " + tagData.getValue(TagData.UUID)); m.setValue(TaskToTagMetadata.TAG_UUID, tagData.getValue(TagData.UUID)); } else { - if (Constants.DEBUG) + if (ActFmInvoker.SYNC_DEBUG) Log.w(LOG_TAG, "Tag not found, deleting link"); m.setValue(Metadata.DELETION_DATE, DateUtilities.now()); } diff --git a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java index ef93af688..3ea1c5f02 100644 --- a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java +++ b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java @@ -92,7 +92,7 @@ public class MetadataDao extends DatabaseDao { String tagUuid = modelSetValues.getAsString(TaskToTagMetadata.TAG_UUID.name); Long deletionDate = modelSetValues.getAsLong(Metadata.DELETION_DATE.name); if (taskId == null || taskId == AbstractModel.NO_ID || RemoteModel.isUuidEmpty(tagUuid)) - return false; + return true; TaskOutstanding to = new TaskOutstanding(); to.setValue(OutstandingEntry.ENTITY_ID_PROPERTY, taskId); diff --git a/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java b/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java index 4f43f3335..c14a106c1 100644 --- a/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java +++ b/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java @@ -9,7 +9,9 @@ import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Table; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; +import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; +import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.AstridNewSyncMigrator; import com.todoroo.astrid.dao.MetadataDao; @@ -42,11 +44,11 @@ public class AstridNewSyncMigrationTest extends NewSyncTestCase { // Init 5 unsynced tasks and tags for (int i = 1; i <= 5; i++) { Task task = createTask("Task " + i, true); - task.setValue(TASK_REMOTE_ID_FIELD, 0L); + task.setValue(TASK_REMOTE_ID_FIELD, null); taskDao.save(task); TagData tag = createTagData("Tag " + i, true); - tag.setValue(TAG_REMOTE_ID_FIELD, 0L); + tag.setValue(TAG_REMOTE_ID_FIELD, null); tagDataDao.saveExisting(tag); }