From 6d00337db370355087d8b3087be8cb6d9aa5f338 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 7 Aug 2011 16:23:23 -0400 Subject: [PATCH] Code Cleanup - Merging Record and Task objects, step 1. --- src/Record.cpp | 24 -------------- src/Record.h | 2 -- src/Task.cpp | 24 ++++++++++++++ src/Task.h | 1 + test/record.t.cpp | 84 +++++++++++++++++++++++------------------------ 5 files changed, 67 insertions(+), 68 deletions(-) diff --git a/src/Record.cpp b/src/Record.cpp index df7977a6e..d53b4bfce 100644 --- a/src/Record.cpp +++ b/src/Record.cpp @@ -55,30 +55,6 @@ Record::~Record () { } -//////////////////////////////////////////////////////////////////////////////// -// The format is: -// -// [ Att::composeF4 ... ] \n -// -std::string Record::composeF4 () const -{ - std::string ff4 = "["; - - bool first = true; - std::map ::const_iterator it; - for (it = this->begin (); it != this->end (); ++it) - { - if (it->second.value () != "") - { - ff4 += (first ? "" : " ") + it->second.composeF4 (); - first = false; - } - } - - ff4 += "]\n"; - return ff4; -} - //////////////////////////////////////////////////////////////////////////////// // // start --> [ --> Att --> ] --> end diff --git a/src/Record.h b/src/Record.h index 93fbc0820..5e8888542 100644 --- a/src/Record.h +++ b/src/Record.h @@ -41,8 +41,6 @@ public: Record (const std::string&); // Copy constructor virtual ~Record (); // Destructor - std::string composeF4 () const; - std::string composeCSV () const; void parse (const std::string&); bool has (const std::string&) const; diff --git a/src/Task.cpp b/src/Task.cpp index ef2447865..91e01011f 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -373,6 +373,30 @@ void Task::legacyParse (const std::string& line) } } +//////////////////////////////////////////////////////////////////////////////// +// The format is: +// +// [ Att::composeF4 ... ] \n +// +std::string Task::composeF4 () const +{ + std::string ff4 = "["; + + bool first = true; + std::map ::const_iterator it; + for (it = this->begin (); it != this->end (); ++it) + { + if (it->second.value () != "") + { + ff4 += (first ? "" : " ") + it->second.composeF4 (); + first = false; + } + } + + ff4 += "]\n"; + return ff4; +} + //////////////////////////////////////////////////////////////////////////////// std::string Task::composeCSV () const { diff --git a/src/Task.h b/src/Task.h index d0ca35844..2b36ab2a3 100644 --- a/src/Task.h +++ b/src/Task.h @@ -42,6 +42,7 @@ public: ~Task (); // Destructor void parse (const std::string&); + std::string composeF4 () const; std::string composeCSV () const; std::string composeYAML () const; std::string composeJSON (bool include_id = false) const; diff --git a/test/record.t.cpp b/test/record.t.cpp index f49c07dc1..dc6e61ec4 100644 --- a/test/record.t.cpp +++ b/test/record.t.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include Context context; @@ -39,75 +39,75 @@ int main (int argc, char** argv) // (blank) bool good = true; - Record record; + Task task; - try {record = Record ("");} + try {task = Task ("");} catch (std::string& e){t.diag (e); good = false;} - t.notok (good, "Record::Record ('')"); + t.notok (good, "Task::Task ('')"); // [] good = true; - try {record = Record ("[]");} + try {task = Task ("[]");} catch (std::string& e){t.diag (e); good = false;} - t.notok (good, "Record::Record ('[]')"); + t.notok (good, "Task::Task ('[]')"); // [name:value] good = true; - try {record = Record ("[name:value]");} + try {task = Task ("[name:value]");} catch (std::string& e){t.diag (e); good = false;} - t.ok (good, "Record::Record ('[name:value]')"); - t.is (record.get ("name"), "value", "name=value"); + t.ok (good, "Task::Task ('[name:value]')"); + t.is (task.get ("name"), "value", "name=value"); // [name:"value"] good = true; - try {record = Record ("[name:\"value\"]");} + try {task = Task ("[name:\"value\"]");} catch (std::string& e){t.diag (e); good = false;} - t.ok (good, "Record::Record ('[name:\"value\"]')"); - t.is (record.get ("name"), "value", "name=value"); + t.ok (good, "Task::Task ('[name:\"value\"]')"); + t.is (task.get ("name"), "value", "name=value"); // [name:"one two"] good = true; - try {record = Record ("[name:\"one two\"]");} + try {task = Task ("[name:\"one two\"]");} catch (std::string& e){t.diag (e); good = false;} - t.ok (good, "Record::Record ('[name:\"one two\"]')"); - t.is (record.get ("name"), "one two", "name=one two"); + t.ok (good, "Task::Task ('[name:\"one two\"]')"); + t.is (task.get ("name"), "one two", "name=one two"); // [one:two three:four] good = true; - try {record = Record ("[one:\"two\" three:\"four\"]");} + try {task = Task ("[one:\"two\" three:\"four\"]");} catch (std::string& e){t.diag (e); good = false;} - t.ok (good, "Record::Record ('[one:\"two\" three:\"four\"]')"); - t.is (record.get ("one"), "two", "one=two"); - t.is (record.get ("three"), "four", "three=four"); + t.ok (good, "Task::Task ('[one:\"two\" three:\"four\"]')"); + t.is (task.get ("one"), "two", "one=two"); + t.is (task.get ("three"), "four", "three=four"); - // Record::set - record.clear (); - record.set ("name", "value"); - t.is (record.composeF4 (), "[name:\"value\"]\n", "Record::set"); + // Task::set + task.clear (); + task.set ("name", "value"); + t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::set"); - // Record::has - t.ok (record.has ("name"), "Record::has"); - t.notok (record.has ("woof"), "Record::has not"); + // Task::has + t.ok (task.has ("name"), "Task::has"); + t.notok (task.has ("woof"), "Task::has not"); - // Record::get_int - record.set ("one", 1); - t.is (record.composeF4 (), "[name:\"value\" one:\"1\"]\n", "Record::set"); - t.is (record.get_int ("one"), 1, "Record::get_int"); + // Task::get_int + task.set ("one", 1); + t.is (task.composeF4 (), "[name:\"value\" one:\"1\"]\n", "Task::set"); + t.is (task.get_int ("one"), 1, "Task::get_int"); - // Record::get_ulong - record.set ("two", "4294967295"); - t.is (record.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]\n", "Record::set"); - t.is ((size_t)record.get_ulong ("two"), (size_t)4294967295, "Record::get_ulong"); + // Task::get_ulong + task.set ("two", "4294967295"); + t.is (task.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]\n", "Task::set"); + t.is ((size_t)task.get_ulong ("two"), (size_t)4294967295, "Task::get_ulong"); - // Record::remove - record.remove ("one"); - record.remove ("two"); - t.is (record.composeF4 (), "[name:\"value\"]\n", "Record::remove"); + // Task::remove + task.remove ("one"); + task.remove ("two"); + t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::remove"); - // Record::all - std::vector all = record.all (); - t.is (all.size (), (size_t)1, "Record::all size"); - t.is (all[0].name (), "name", "Record::all[0].name ()"); + // Task::all + std::vector all = task.all (); + t.is (all.size (), (size_t)1, "Task::all size"); + t.is (all[0].name (), "name", "Task::all[0].name ()"); return 0; }