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

Fixed compilation errors in the title parser test

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent dd552cd4c0
commit 65340cd042
1 changed files with 112 additions and 84 deletions
Show Stats Download Patch File Download Diff File

196
tests/src/com/todoroo/andlib/utility/TitleParserTest.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class TitleParserTest extends DatabaseTestCase {
Task task = new Task(); Task task = new Task();
Task nothing = new Task(); Task nothing = new Task();
task.setValue(Task.TITLE, "Jog"); task.setValue(Task.TITLE, "Jog");
taskService.quickAdd(task); taskService.save(task);
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
assertEquals(task.getValue(Task.RECURRENCE), nothing.getValue(Task.RECURRENCE)); assertEquals(task.getValue(Task.RECURRENCE), nothing.getValue(Task.RECURRENCE));
@ -152,7 +152,7 @@ public class TitleParserTest extends DatabaseTestCase {
private void insertTitleAddTask(String title, Task task, TaskService taskService) { private void insertTitleAddTask(String title, Task task, TaskService taskService) {
task.clear(); task.clear();
task.setValue(Task.TITLE, title); task.setValue(Task.TITLE, title);
taskService.quickAdd(task); TaskService.createWithValues(task, null, title);
} }
@ -162,15 +162,17 @@ public class TitleParserTest extends DatabaseTestCase {
TaskService taskService = new TaskService(); TaskService taskService = new TaskService();
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog today"); String title = "Jog today";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
Date date = new Date(task.getValue(Task.DUE_DATE)); Date date = new Date(task.getValue(Task.DUE_DATE));
assertEquals(date.getDay()+1, today.get(Calendar.DAY_OF_WEEK)); assertEquals(date.getDay()+1, today.get(Calendar.DAY_OF_WEEK));
//Calendar starts 1-6, date.getDay() starts at 0 //Calendar starts 1-6, date.getDay() starts at 0
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog tomorrow"); title = "Jog tomorrow";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
date = new Date(task.getValue(Task.DUE_DATE)); date = new Date(task.getValue(Task.DUE_DATE));
assertEquals((date.getDay()+1) % 7, (today.get(Calendar.DAY_OF_WEEK)+1) % 7); assertEquals((date.getDay()+1) % 7, (today.get(Calendar.DAY_OF_WEEK)+1) % 7);
@ -195,14 +197,16 @@ public class TitleParserTest extends DatabaseTestCase {
for (int i = 1; i <= 6; i++){ for (int i = 1; i <= 6; i++){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog "+ days[i]); title = "Jog "+ days[i];
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
date = new Date(task.getValue(Task.DUE_DATE)); date = new Date(task.getValue(Task.DUE_DATE));
assertEquals(date.getDay(), i); assertEquals(date.getDay(), i);
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog "+ abrevDays[i]); title = "Jog "+ abrevDays[i];
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
date = new Date(task.getValue(Task.DUE_DATE)); date = new Date(task.getValue(Task.DUE_DATE));
assertEquals(date.getDay(), i); assertEquals(date.getDay(), i);
} }
@ -221,18 +225,19 @@ public class TitleParserTest extends DatabaseTestCase {
"lowest priority", "lowest priority",
"bang 0" "bang 0"
}; };
TaskService taskService = new TaskService();
Task task = new Task(); Task task = new Task();
for (String acceptedString:acceptedStrings){ for (String acceptedString:acceptedStrings){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance. String title = "Jog " + acceptedString;
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at end of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_LEAST); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_LEAST);
} }
for (String acceptedString:acceptedStrings){ for (String acceptedString:acceptedStrings){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, acceptedString + " jog"); //test at beginning of task. should not set importance. String title = acceptedString + " jog";
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
TaskService.createWithValues(task, null, title);
assertNotSame((int)task.getValue(Task.IMPORTANCE),(int)Task.IMPORTANCE_LEAST); assertNotSame((int)task.getValue(Task.IMPORTANCE),(int)Task.IMPORTANCE_LEAST);
} }
} }
@ -253,23 +258,23 @@ public class TitleParserTest extends DatabaseTestCase {
for (String acceptedStringAtEnd:acceptedStringsAtEnd){ for (String acceptedStringAtEnd:acceptedStringsAtEnd){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance. task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance.
taskService.quickAdd(task); taskService.save(task);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
} }
for (String acceptedStringAtEnd:acceptedStringsAtEnd){ for (String acceptedStringAtEnd:acceptedStringsAtEnd){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance. task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance.
taskService.quickAdd(task); taskService.save(task);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
} }
for (String acceptedStringAnywhere:acceptedStringsAnywhere){ for (String acceptedStringAnywhere:acceptedStringsAnywhere){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance. task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance.
taskService.quickAdd(task); taskService.save(task);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance. task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance.
taskService.quickAdd(task); taskService.save(task);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
} }
} }
@ -289,23 +294,27 @@ public class TitleParserTest extends DatabaseTestCase {
Task task = new Task(); Task task = new Task();
for (String acceptedStringAtEnd:acceptedStringsAtEnd){ for (String acceptedStringAtEnd:acceptedStringsAtEnd){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance. String title = "Jog " + acceptedStringAtEnd;
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at end of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
task = new Task(); task = new Task();
task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance. title = acceptedStringAtEnd + " jog";
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
TaskService.createWithValues(task, null, title);
assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
} }
for (String acceptedStringAnywhere:acceptedStringsAnywhere){ for (String acceptedStringAnywhere:acceptedStringsAnywhere){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance. String title = "Jog " + acceptedStringAnywhere;
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at end of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance. title = acceptedStringAnywhere + " jog";
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
} }
} }
@ -328,23 +337,27 @@ public class TitleParserTest extends DatabaseTestCase {
Task task = new Task(); Task task = new Task();
for (String acceptedStringAtEnd:acceptedStringsAtEnd){ for (String acceptedStringAtEnd:acceptedStringsAtEnd){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance. String title = "Jog " + acceptedStringAtEnd;
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at end of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
task = new Task(); task = new Task();
task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance. title = acceptedStringAtEnd + " jog";
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
TaskService.createWithValues(task, null, title);
assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
} }
for (String acceptedStringAnywhere:acceptedStringsAnywhere){ for (String acceptedStringAnywhere:acceptedStringsAnywhere){
task = new Task(); task = new Task();
task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance. String title = "Jog " + acceptedStringAnywhere;
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at end of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance. title = acceptedStringAnywhere + " jog";
taskService.quickAdd(task); task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
TaskService.createWithValues(task, null, title);
assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
} }
} }
@ -357,10 +370,10 @@ public class TitleParserTest extends DatabaseTestCase {
//----------------Repeats begin----------------// //----------------Repeats begin----------------//
/** test daily repeat from due date, but with no due date set */ /** test daily repeat from due date, but with no due date set */
public void testDailyWithNoDueDate() throws Exception { public void testDailyWithNoDueDate() throws Exception {
TaskService taskService = new TaskService();
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog daily"); String title = "Jog daily";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
RRule rrule = new RRule(); RRule rrule = new RRule();
rrule.setFreq(Frequency.DAILY); rrule.setFreq(Frequency.DAILY);
rrule.setInterval(1); rrule.setInterval(1);
@ -368,21 +381,23 @@ public class TitleParserTest extends DatabaseTestCase {
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
task.setValue(Task.TITLE, "Jog every day"); title = "Jog every day";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
for (int i = 1; i <= 12; i++){ for (int i = 1; i <= 12; i++){
task.setValue(Task.TITLE, "Jog every " + i + " days."); title = "Jog every " + i + " days.";
task.setValue(Task.TITLE, title);
rrule.setInterval(i); rrule.setInterval(i);
taskService.quickAdd(task); TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
task = new Task(); task = new Task();
} }
} }
@ -390,8 +405,9 @@ public class TitleParserTest extends DatabaseTestCase {
public void testWeeklyWithNoDueDate() throws Exception { public void testWeeklyWithNoDueDate() throws Exception {
TaskService taskService = new TaskService(); TaskService taskService = new TaskService();
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog weekly"); String title = "Jog weekly";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
RRule rrule = new RRule(); RRule rrule = new RRule();
rrule.setFreq(Frequency.WEEKLY); rrule.setFreq(Frequency.WEEKLY);
rrule.setInterval(1); rrule.setInterval(1);
@ -399,16 +415,18 @@ public class TitleParserTest extends DatabaseTestCase {
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
task.setValue(Task.TITLE, "Jog every week"); title = "Jog every week";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
for (int i = 1; i <= 12; i++){ for (int i = 1; i <= 12; i++){
task.setValue(Task.TITLE, "Jog every " + i + " weeks"); title = "Jog every " + i + " weeks";
task.setValue(Task.TITLE, title);
rrule.setInterval(i); rrule.setInterval(i);
taskService.quickAdd(task); TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
@ -418,10 +436,10 @@ public class TitleParserTest extends DatabaseTestCase {
/** test hourly repeat from due date, with no due date but no time */ /** test hourly repeat from due date, with no due date but no time */
public void testMonthlyFromNoDueDate() throws Exception { public void testMonthlyFromNoDueDate() throws Exception {
TaskService taskService = new TaskService();
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog monthly"); String title = "Jog monthly";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
RRule rrule = new RRule(); RRule rrule = new RRule();
rrule.setFreq(Frequency.MONTHLY); rrule.setFreq(Frequency.MONTHLY);
rrule.setInterval(1); rrule.setInterval(1);
@ -429,16 +447,18 @@ public class TitleParserTest extends DatabaseTestCase {
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
task.setValue(Task.TITLE, "Jog every month"); title = "Jog every month";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
for (int i = 1; i <= 12; i++){ for (int i = 1; i <= 12; i++){
task.setValue(Task.TITLE, "Jog every " + i + " months"); title = "Jog every " + i + " months";
task.setValue(Task.TITLE, title);
rrule.setInterval(i); rrule.setInterval(i);
taskService.quickAdd(task); TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertFalse(task.hasDueTime()); assertFalse(task.hasDueTime());
assertFalse(task.hasDueDate()); assertFalse(task.hasDueDate());
@ -446,50 +466,58 @@ public class TitleParserTest extends DatabaseTestCase {
} }
} }
public void testDailyFromDueDate() throws Exception { TaskService taskService = new TaskService(); public void testDailyFromDueDate() throws Exception {
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog daily starting from today"); String title = "Jog daily starting from today";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
RRule rrule = new RRule(); TaskService.createWithValues(task, null, title);
rrule.setFreq(Frequency.DAILY); RRule rrule = new RRule();
rrule.setInterval(1); rrule.setFreq(Frequency.DAILY);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); rrule.setInterval(1);
assertTrue(task.hasDueDate()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate());
task.setValue(Task.TITLE, "Jog every day starting from today");
taskService.quickAdd(task); task.clearValue(Task.ID);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); title = "Jog every day starting from today";
assertTrue(task.hasDueDate()); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
for (int i = 1; i <= 12; i++){
task.setValue(Task.TITLE, "Jog every " + i + " days starting from today");
rrule.setInterval(i);
taskService.quickAdd(task);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate()); assertTrue(task.hasDueDate());
task = new Task();
for (int i = 1; i <= 12; i++){
title = "Jog every " + i + " days starting from today";
task.setValue(Task.TITLE, title);
rrule.setInterval(i);
TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate());
task = new Task();
}
} }
}
public void testWeeklyFromDueDate() throws Exception { TaskService taskService = new TaskService(); public void testWeeklyFromDueDate() throws Exception {
Task task = new Task(); Task task = new Task();
task.setValue(Task.TITLE, "Jog weekly starting from today"); String title = "Jog weekly starting from today";
taskService.quickAdd(task); task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
RRule rrule = new RRule(); RRule rrule = new RRule();
rrule.setFreq(Frequency.WEEKLY); rrule.setFreq(Frequency.WEEKLY);
rrule.setInterval(1); rrule.setInterval(1);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate()); assertTrue(task.hasDueDate());
task.setValue(Task.TITLE, "Jog every week starting from today"); task.clearValue(Task.ID);
taskService.quickAdd(task); title = "Jog every week starting from today";
task.setValue(Task.TITLE, title);
TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate()); assertTrue(task.hasDueDate());
for (int i = 1; i <= 12; i++){ for (int i = 1; i <= 12; i++){
task.setValue(Task.TITLE, "Jog every " + i + " weeks starting from today"); title = "Jog every " + i + " weeks starting from today";
task.setValue(Task.TITLE, title);
rrule.setInterval(i); rrule.setInterval(i);
taskService.quickAdd(task); TaskService.createWithValues(task, null, title);
assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal()); assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
assertTrue(task.hasDueDate()); assertTrue(task.hasDueDate());
task = new Task(); task = new Task();

Write Preview
Loading…
Cancel
Save