|
|
@ -23,7 +23,6 @@ import com.todoroo.astrid.dao.TaskDao;
|
|
|
|
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
|
|
|
|
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
|
|
|
|
import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
|
|
|
|
import com.todoroo.astrid.service.StartupService;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.test.DatabaseTestCase;
|
|
|
|
import com.todoroo.astrid.test.DatabaseTestCase;
|
|
|
|
import com.todoroo.astrid.utility.Flags;
|
|
|
|
import com.todoroo.astrid.utility.Flags;
|
|
|
|
|
|
|
|
|
|
|
@ -117,11 +116,6 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
|
|
|
|
|
|
|
|
|
|
|
|
protected void testRepeating(boolean completeBefore, boolean fromCompletion,
|
|
|
|
protected void testRepeating(boolean completeBefore, boolean fromCompletion,
|
|
|
|
RRule rrule, Frequency frequency, String title) {
|
|
|
|
RRule rrule, Frequency frequency, String title) {
|
|
|
|
for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) { // Create startup tasks so sync services don't miss the test tasks
|
|
|
|
|
|
|
|
Task temp = new Task();
|
|
|
|
|
|
|
|
temp.setValue(Task.TITLE, "" + i);
|
|
|
|
|
|
|
|
taskDao.save(temp);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Task t = new Task();
|
|
|
|
Task t = new Task();
|
|
|
|
t.setValue(Task.TITLE, title);
|
|
|
|
t.setValue(Task.TITLE, title);
|
|
|
|
long dueDate = DateUtilities.now() + DateUtilities.ONE_DAY * 3;
|
|
|
|
long dueDate = DateUtilities.now() + DateUtilities.ONE_DAY * 3;
|
|
|
@ -155,11 +149,8 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
|
|
|
|
Task task = new Task(cursor);
|
|
|
|
Task task = new Task(cursor);
|
|
|
|
System.err.println("Task: " + task.getValue(Task.TITLE) + ", due: " + task.getValue(Task.DUE_DATE));
|
|
|
|
System.err.println("Task: " + task.getValue(Task.TITLE) + ", due: " + task.getValue(Task.DUE_DATE));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assertEquals(StartupService.INTRO_TASK_SIZE + 2, cursor.getCount());
|
|
|
|
assertEquals(2, cursor.getCount());
|
|
|
|
cursor.moveToFirst();
|
|
|
|
cursor.moveToFirst();
|
|
|
|
for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) {
|
|
|
|
|
|
|
|
cursor.moveToNext();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
t.readFromCursor(cursor);
|
|
|
|
t.readFromCursor(cursor);
|
|
|
|
|
|
|
|
|
|
|
|
assertEquals(title, t.getValue(Task.TITLE));
|
|
|
|
assertEquals(title, t.getValue(Task.TITLE));
|
|
|
|