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

Remove Task cursors from tests

Browse Source
pull/189/head
Alex Baker 10 years ago
parent c1273f6b97
commit daeafabcc4
2 changed files with 33 additions and 91 deletions
Show Stats Download Patch File Download Diff File

76
astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
Unescape Escape View File

@ -6,13 +6,14 @@
package com.todoroo.astrid.dao;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import java.util.List;
import javax.inject.Inject;
public class TaskDaoTests extends DatabaseTestCase {
@ -28,19 +29,13 @@ public class TaskDaoTests extends DatabaseTestCase {
* Test basic task creation, fetch, and save
*/
public void disabled_testTaskCreation() {
TodorooCursor<Task> cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
// create task "happy"
Task task = new Task();
task.setTitle("happy");
taskDao.save(task);
cursor = taskDao.query(
Query.select(IDS));
assertEquals(1, cursor.getCount());
cursor.close();
assertEquals(1, taskDao.toList(Query.select(IDS)).size());
long happyId = task.getId();
assertNotSame(Task.NO_ID, happyId);
task = taskDao.fetch(happyId, TITLES);
@ -50,20 +45,14 @@ public class TaskDaoTests extends DatabaseTestCase {
task = new Task();
task.setTitle("sad");
taskDao.save(task);
cursor = taskDao.query(
Query.select(IDS));
assertEquals(2, cursor.getCount());
cursor.close();
assertEquals(2, taskDao.toList(Query.select(IDS)).size());
// rename sad to melancholy
long sadId = task.getId();
assertNotSame(Task.NO_ID, sadId);
task.setTitle("melancholy");
taskDao.save(task);
cursor = taskDao.query(
Query.select(IDS));
assertEquals(2, cursor.getCount());
cursor.close();
assertEquals(2, taskDao.toList(Query.select(IDS)).size());
// check state
task = taskDao.fetch(happyId, TITLES);
@ -110,59 +99,39 @@ public class TaskDaoTests extends DatabaseTestCase {
taskDao.save(task);
// check has no name
TodorooCursor<Task> cursor = taskDao.query(
Query.select(TITLES).where(TaskCriteria.hasNoTitle()));
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("", cursor.getString(1));
cursor.close();
List<Task> tasks = taskDao.toList(Query.select(TITLES).where(TaskCriteria.hasNoTitle()));
assertEquals(1, tasks.size());
assertEquals("", tasks.get(0).getTitle());
// check is active
cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
isActive()));
assertEquals(5, cursor.getCount());
cursor.close();
assertEquals(5, taskDao.toList(Query.select(TITLES).where(TaskCriteria.isActive())).size());
// check is visible
cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
isVisible()));
assertEquals(5, cursor.getCount());
cursor.close();
assertEquals(5, taskDao.toList(Query.select(TITLES).where(TaskCriteria.isVisible())).size());
}
/**
* Test task deletion
*/
public void disabled_testTDeletion() {
TodorooCursor<Task> cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
// create task "happy"
Task task = new Task();
task.setTitle("happy");
taskDao.save(task);
cursor = taskDao.query(
Query.select(IDS));
assertEquals(1, cursor.getCount());
cursor.close();
assertEquals(1, taskDao.toList(Query.select(IDS)).size());
// delete
long happyId = task.getId();
assertTrue(taskDao.delete(happyId));
cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
}
/**
* Test save without prior create doesn't work
*/
public void disabled_testSaveWithoutCreate() {
TodorooCursor<Task> cursor;
// try to save task "happy"
Task task = new Task();
task.setTitle("happy");
@ -170,32 +139,21 @@ public class TaskDaoTests extends DatabaseTestCase {
taskDao.save(task);
cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
}
/**
* Test passing invalid task indices to various things
*/
public void disabled_testInvalidIndex() {
TodorooCursor<Task> cursor;
cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
assertNull(taskDao.fetch(1, IDS));
assertFalse(taskDao.delete(1));
// make sure db still works
cursor = taskDao.query(
Query.select(IDS));
assertEquals(0, cursor.getCount());
cursor.close();
assertEquals(0, taskDao.toList(Query.select(IDS)).size());
}
// TODO check eventing

48
astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java
Unescape Escape View File

@ -11,7 +11,6 @@ import com.google.ical.values.Frequency;
import com.google.ical.values.RRule;
import com.google.ical.values.Weekday;
import com.google.ical.values.WeekdayNum;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
@ -95,12 +94,7 @@ public class NewRepeatTests extends DatabaseTestCase {
t.setCompletionDate(DateUtilities.now());
saveAndTriggerRepeatListener(t);
TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.ID));
try {
assertEquals(1, cursor.getCount());
} finally {
cursor.close();
}
assertEquals(1, taskDao.toList(Query.select(Task.ID)).size());
}
protected void testRepeating(boolean completeBefore, boolean fromCompletion,
@ -136,31 +130,21 @@ public class NewRepeatTests extends DatabaseTestCase {
waitAndSync();
TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.PROPERTIES).where(TaskCriteria.notDeleted()));
try {
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
Task task = new Task(cursor);
System.err.println("Task: " + task.getTitle() + ", due: " + task.getDueDate());
}
assertEquals(1, cursor.getCount());
cursor.moveToFirst();
t = new Task(cursor);
assertEquals(title, t.getTitle());
assertFalse(t.isCompleted());
long newDueDate = t.getDueDate();
assertTrue(t.hasDueTime());
long fromDate = (fromCompletion? completionDate : dueDate);
long expectedTime = computeNextDueDateFromDate(fromDate, rrule, fromCompletion);
if (frequency == Frequency.WEEKLY) // We do this because DST was making the results be off by an hour
assertTimesWithinOneHour(expectedTime, newDueDate);
else
assertTimesMatch(expectedTime, newDueDate);
} finally {
cursor.close();
}
List<Task> tasks = taskDao.toList(Query.select(Task.PROPERTIES).where(TaskCriteria.notDeleted()));
assertEquals(1, tasks.size());
t = tasks.get(0);
assertEquals(title, t.getTitle());
assertFalse(t.isCompleted());
long newDueDate = t.getDueDate();
assertTrue(t.hasDueTime());
long fromDate = (fromCompletion? completionDate : dueDate);
long expectedTime = computeNextDueDateFromDate(fromDate, rrule, fromCompletion);
if (frequency == Frequency.WEEKLY) // We do this because DST was making the results be off by an hour
assertTimesWithinOneHour(expectedTime, newDueDate);
else
assertTimesMatch(expectedTime, newDueDate);
}
private long computeWeeklyCaseDueDate(long fromDate, RRule rrule, boolean fromCompletion) {

Write Preview
Loading…
Cancel
Save