Enhancements - Complete Record parsing

- Enhanced Record unit tests
- Fixed broken Att unit tests
- Fixed broken Att
This commit is contained in:
Paul Beckingham 2009-06-01 01:25:07 -04:00
parent 75c220c352
commit a98951a8c3
5 changed files with 54 additions and 77 deletions

View file

@ -30,7 +30,7 @@
////////////////////////////////////////////////////////////////////////////////
int main (int argc, char** argv)
{
UnitTest t (38);
UnitTest t (37);
Att a1 ("name", "value");
t.is (a1.name (), "name", "Att::Att (name, value), Att.name");
@ -145,22 +145,19 @@ int main (int argc, char** argv)
good = true;
try {a7.parse (n);} catch (...) {good = false;}
t.ok (good, "Att::parse (name:\"value)");
t.is (a7.composeF4 (), "name:\"value\"", "Att::composeF4 -> name:\"value\"");
t.is (a7.composeF4 (), "name:\""value\"", "Att::composeF4 -> name:\""value\"");
n = Nibbler ("name:value\"");
good = true;
try {a7.parse (n);} catch (...) {good = false;}
t.ok (good, "Att::parse (name:value\")");
t.is (a7.composeF4 (), "name:\"value\"", "Att::composeF4 -> name:\"value\"");
t.is (a7.composeF4 (), "name:\"value"\"", "Att::composeF4 -> name:\"value"\"");
n = Nibbler ("name:val\"ue");
good = true;
try {a7.parse (n);} catch (...) {good = false;}
t.ok (good, "Att::parse (name:val\"ue)");
t.is (a7.composeF4 (), "name:\"value\"", "Att::composeF4 -> name:\"value\"");
n = Nibbler ("name:\"\"va\"\"\"\"\"lu\"\"\"e\"\"");
t.is (a7.composeF4 (), "name:\"value\"", "Att::composeF4 (name:\"\"va\"\"\"\"\"lu\"\"\"e\"\")");
t.is (a7.composeF4 (), "name:\"val"ue\"", "Att::composeF4 -> name:\"val"ue\"");
n = Nibbler ("name\"");
good = true;

View file

@ -29,57 +29,53 @@
#include <Record.h>
#include <test.h>
////////////////////////////////////////////////////////////////////////////////
Record parseRecord (const std::string& input)
{
try
{
Record r (input);
return r;
}
catch (std::string& e)
{
std::cout << "# Exception: " << e << std::endl;
}
catch (...)
{
std::cout << "# Exception!" << std::endl;
}
return Record ();
}
////////////////////////////////////////////////////////////////////////////////
int main (int argc, char** argv)
{
UnitTest t (4);
UnitTest t (11);
// (blank)
Record record = parseRecord ("");
t.is (record.size (), (size_t)0, "Record (blank)");
bool good = true;
Record record;
try {record = Record ("");}
catch (std::string& e){t.diag (e); good = false;}
t.notok (good, "Record::Record ('')");
// []
record = parseRecord ("[]");
t.is (record.size (), (size_t)0, "Record []");
good = true;
try {record = Record ("[]");}
catch (std::string& e){t.diag (e); good = false;}
t.notok (good, "Record::Record ('[]')");
// [name:value]
good = true;
try {record = Record ("[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");
// [name:"value"]
record = parseRecord ("[name:\"value\"]");
t.is (record.size (), (size_t)1, "Record [name:value]");
if (record.size () == 1)
{
Att a = record["name"];
t.is (a.name (), "name", "Record [name:value] -> 'name'");
}
else
{
t.fail ("Record [name:value] -> 'name'");
}
good = true;
try {record = Record ("[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");
// TODO [name:"value"]
// TODO [name:"one two"]
// TODO [one:two three:four]
// [name:"one two"]
good = true;
try {record = Record ("[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");
// [one:two three:four]
good = true;
try {record = Record ("[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");
return 0;
}