archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed references to pushed_at columns in NameMaps

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 9e64858c8f
commit 4901e83765
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File

11
astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
Unescape Escape View File

@ -27,11 +27,11 @@ public class NameMaps {
public static final String TABLE_ID_TAGS = "tags";
public static final String TABLE_ID_USERS = "users";
public static final String TABLE_ID_USER_ACTIVITY = "user_activities";
public static final String TABLE_ID_PUSHED_AT = "pushed_at";
public static final String PUSHED_AT_TASKS = TABLE_ID_PUSHED_AT + "_" + TABLE_ID_TASKS;
public static final String PUSHED_AT_TAGS = TABLE_ID_PUSHED_AT + "_" + TABLE_ID_TAGS;
public static final String PUSHED_AT_ACTIVITY = TABLE_ID_PUSHED_AT + "_" + TABLE_ID_USER_ACTIVITY;
private static final String PUSHED_AT_PREFIX = "pushed_at";
public static final String PUSHED_AT_TASKS = PUSHED_AT_PREFIX + "_" + TABLE_ID_TASKS;
public static final String PUSHED_AT_TAGS = PUSHED_AT_PREFIX + "_" + TABLE_ID_TAGS;
public static final String PUSHED_AT_ACTIVITY = PUSHED_AT_PREFIX + "_" + TABLE_ID_USER_ACTIVITY;
static {
// Hardcoded local tables mapped to corresponding server names
@ -122,7 +122,6 @@ public class NameMaps {
putTaskPropertyToServerName(Task.USER_ID, "user_id", false);
putTaskPropertyToServerName(Task.CREATOR_ID, "creator_id", true);
putTaskPropertyToServerName(Task.UUID, "uuid", true);
putTaskPropertyToServerName(Task.PUSHED_AT, "pushed_at", true);
putTaskPropertyToServerName(Task.IS_PUBLIC, "public", false);
putTaskPropertyToServerName(Task.IS_READONLY, "read_only", true);
putTaskPropertyToServerName(Task.CLASSIFICATION, "classification", true);
@ -161,7 +160,6 @@ public class NameMaps {
putTagPropertyToServerName(TagData.DELETION_DATE, "deleted_at", false);
putTagPropertyToServerName(TagData.UUID, "uuid", true);
putTagPropertyToServerName(TagData.TAG_ORDERING, "tag_ordering", true);
putTagPropertyToServerName(TagData.PUSHED_AT, "pushed_at", true);
putTagPropertyToServerName(TagData.TASK_COUNT, "task_count", true);
putTagPropertyToServerName(TagData.TAG_DESCRIPTION, "description", false);
putTagPropertyToServerName(TagData.PICTURE, "picture", false);
@ -196,7 +194,6 @@ public class NameMaps {
putUserPropertyToServerName(User.UUID, "uuid", true);
putUserPropertyToServerName(User.EMAIL, "email", true);
putUserPropertyToServerName(User.PICTURE, "picture", true);
putUserPropertyToServerName(User.PUSHED_AT, "pushed_at", true);
putUserPropertyToServerName(User.FIRST_NAME, "first_name", true);
putUserPropertyToServerName(User.LAST_NAME, "last_name", true);

32
tests-sync/src/com/todoroo/astrid/sync/SyncMessageTest.java
Unescape Escape View File

@ -47,26 +47,13 @@ public class SyncMessageTest extends NewSyncTestCase {
return makeChanges;
}
private JSONObject getMakeChangesForPushedAt(long date) throws JSONException {
JSONObject makeChanges = new JSONObject();
makeChanges.put("type", ServerToClientMessage.TYPE_MAKE_CHANGES);
makeChanges.put("table", NameMaps.TABLE_ID_PUSHED_AT);
makeChanges.put("uuid", NameMaps.TABLE_ID_TASKS);
JSONObject changes = new JSONObject();
changes.put("pushed_at", DateUtilities.timeToIso8601(date, true));
makeChanges.put("changes", changes);
return makeChanges;
}
public void testMakeChangesMakesChanges() {
Task t = createTask();
try {
JSONObject makeChanges = getMakeChanges();
makeChanges.put("uuid", t.getValue(Task.UUID));
ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges, DateUtilities.now());
ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
message.processMessage();
t = taskDao.fetch(t.getId(), Task.TITLE, Task.IMPORTANCE);
@ -82,7 +69,7 @@ public class SyncMessageTest extends NewSyncTestCase {
try {
JSONObject makeChanges = getMakeChanges();
makeChanges.put("uuid", "1");
ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges, DateUtilities.now());
ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
message.processMessage();
TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.ID, Task.UUID, Task.TITLE, Task.IMPORTANCE).where(Task.UUID.eq("1")));
@ -104,21 +91,6 @@ public class SyncMessageTest extends NewSyncTestCase {
}
}
public void testMakeChangesToPushedAtValues() {
try {
long date = DateUtilities.now() / 1000 * 1000;
JSONObject makeChanges = getMakeChangesForPushedAt(date);
ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges, DateUtilities.now());
message.processMessage();
assertEquals(date, Preferences.getLong(NameMaps.PUSHED_AT_TASKS, 0));
} catch (JSONException e) {
e.printStackTrace();
fail("JSONException");
}
}
public void testReplayOutstandingEntries() {
Task t = createTask();

Write Preview
Loading…
Cancel
Save