FF4/JSON Interop

- Removed the \n characters from Task::composeFF4 and Task::ComposeJSON.
- Tasks in backlog.data file are now written as JSON.
- Tasks are recognized in FF4 or JSON format.
This commit is contained in:
Paul Beckingham 2013-06-02 20:38:58 -04:00
parent 29e9dbcea6
commit 4133d29cca
5 changed files with 59 additions and 59 deletions

View file

@ -77,7 +77,7 @@ int main (int argc, char** argv)
// Task::set
task.clear ();
task.set ("name", "value");
t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::set");
t.is (task.composeF4 (), "[name:\"value\"]", "Task::set");
// Task::has
t.ok (task.has ("name"), "Task::has");
@ -85,18 +85,18 @@ int main (int argc, char** argv)
// Task::get_int
task.set ("one", 1);
t.is (task.composeF4 (), "[name:\"value\" one:\"1\"]\n", "Task::set");
t.is (task.composeF4 (), "[name:\"value\" one:\"1\"]", "Task::set");
t.is (task.get_int ("one"), 1, "Task::get_int");
// Task::get_ulong
task.set ("two", "4294967295");
t.is (task.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]\n", "Task::set");
t.is (task.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]", "Task::set");
t.is ((size_t)task.get_ulong ("two"), (size_t)4294967295UL, "Task::get_ulong");
// Task::remove
task.remove ("one");
task.remove ("two");
t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::remove");
t.is (task.composeF4 (), "[name:\"value\"]", "Task::remove");
// Task::all
t.is (task.size (), (size_t)1, "Task::all size");

View file

@ -57,7 +57,7 @@ int main (int argc, char** argv)
std::vector <Task> pending = context.tdb2.pending.get_tasks ();
std::vector <Task> completed = context.tdb2.completed.get_tasks ();
std::vector <std::string> undo = context.tdb2.undo.get_lines ();
std::vector <Task> backlog = context.tdb2.backlog.get_tasks ();
std::vector <std::string> backlog = context.tdb2.backlog.get_lines ();
t.is ((int) pending.size (), 0, "TDB2 Read empty pending");
t.is ((int) completed.size (), 0, "TDB2 Read empty completed");
@ -71,7 +71,7 @@ int main (int argc, char** argv)
pending = context.tdb2.pending.get_tasks ();
completed = context.tdb2.completed.get_tasks ();
undo = context.tdb2.undo.get_lines ();
backlog = context.tdb2.backlog.get_tasks ();
backlog = context.tdb2.backlog.get_lines ();
t.is ((int) pending.size (), 1, "TDB2 after add, 1 pending task");
t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");
@ -84,7 +84,7 @@ int main (int argc, char** argv)
pending = context.tdb2.pending.get_tasks ();
completed = context.tdb2.completed.get_tasks ();
undo = context.tdb2.undo.get_lines ();
backlog = context.tdb2.backlog.get_tasks ();
backlog = context.tdb2.backlog.get_lines ();
t.is ((int) pending.size (), 1, "TDB2 after add, 1 pending task");
t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");