Tests: Eliminated namedDates

This commit is contained in:
Paul Beckingham
2017-03-05 09:34:30 -05:00
parent 4046886e2a
commit 9b0b314618

View File

@@ -26,17 +26,14 @@
#include <cmake.h> #include <cmake.h>
#include <test.h> #include <test.h>
#include <Dates.h> #include <Datetime.h>
#include <Context.h>
Context context;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void testInit (UnitTest& t, const std::string& value, Variant& var) void testInit (UnitTest& t, const std::string& value, Datetime& var)
{ {
try try
{ {
namedDates (value, var); var = Datetime (value);
t.pass (value + " --> valid"); t.pass (value + " --> valid");
} }
@@ -55,23 +52,23 @@ void testInit (UnitTest& t, const std::string& value, Variant& var)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int main (int, char**) int main (int, char**)
{ {
UnitTest t (105); UnitTest t (101);
Variant sunday; testInit (t, "sunday", sunday); Datetime sunday; testInit (t, "sunday", sunday);
Variant monday; testInit (t, "monday", monday); Datetime monday; testInit (t, "monday", monday);
Variant tuesday; testInit (t, "tuesday", tuesday); Datetime tuesday; testInit (t, "tuesday", tuesday);
Variant wednesday; testInit (t, "wednesday", wednesday); Datetime wednesday; testInit (t, "wednesday", wednesday);
Variant thursday; testInit (t, "thursday", thursday); Datetime thursday; testInit (t, "thursday", thursday);
Variant friday; testInit (t, "friday", friday); Datetime friday; testInit (t, "friday", friday);
Variant saturday; testInit (t, "saturday", saturday); Datetime saturday; testInit (t, "saturday", saturday);
Variant sun; testInit (t, "sun", sun); Datetime sun; testInit (t, "sun", sun);
Variant mon; testInit (t, "mon", mon); Datetime mon; testInit (t, "mon", mon);
Variant tue; testInit (t, "tue", tue); Datetime tue; testInit (t, "tue", tue);
Variant wed; testInit (t, "wed", wed); Datetime wed; testInit (t, "wed", wed);
Variant thu; testInit (t, "thu", thu); Datetime thu; testInit (t, "thu", thu);
Variant fri; testInit (t, "fri", fri); Datetime fri; testInit (t, "fri", fri);
Variant sat; testInit (t, "sat", sat); Datetime sat; testInit (t, "sat", sat);
t.ok (sunday == sun, "sunday == sun"); t.ok (sunday == sun, "sunday == sun");
t.ok (monday == mon, "monday == mon"); t.ok (monday == mon, "monday == mon");
@@ -81,30 +78,30 @@ int main (int, char**)
t.ok (friday == fri, "friday == fri"); t.ok (friday == fri, "friday == fri");
t.ok (saturday == sat, "saturday == sat"); t.ok (saturday == sat, "saturday == sat");
Variant january; testInit (t, "january", january); Datetime january; testInit (t, "january", january);
Variant february; testInit (t, "february", february); Datetime february; testInit (t, "february", february);
Variant march; testInit (t, "march", march); Datetime march; testInit (t, "march", march);
Variant april; testInit (t, "april", april); Datetime april; testInit (t, "april", april);
Variant may; testInit (t, "may", may); Datetime may; testInit (t, "may", may);
Variant june; testInit (t, "june", june); Datetime june; testInit (t, "june", june);
Variant july; testInit (t, "july", july); Datetime july; testInit (t, "july", july);
Variant august; testInit (t, "august", august); Datetime august; testInit (t, "august", august);
Variant september; testInit (t, "september", september); Datetime september; testInit (t, "september", september);
Variant october; testInit (t, "october", october); Datetime october; testInit (t, "october", october);
Variant november; testInit (t, "november", november); Datetime november; testInit (t, "november", november);
Variant december; testInit (t, "december", december); Datetime december; testInit (t, "december", december);
Variant jan; testInit (t, "jan", jan); Datetime jan; testInit (t, "jan", jan);
Variant feb; testInit (t, "feb", feb); Datetime feb; testInit (t, "feb", feb);
Variant mar; testInit (t, "mar", mar); Datetime mar; testInit (t, "mar", mar);
Variant apr; testInit (t, "apr", apr); Datetime apr; testInit (t, "apr", apr);
Variant jun; testInit (t, "jun", jun); Datetime jun; testInit (t, "jun", jun);
Variant jul; testInit (t, "jul", jul); Datetime jul; testInit (t, "jul", jul);
Variant aug; testInit (t, "aug", aug); Datetime aug; testInit (t, "aug", aug);
Variant sep; testInit (t, "sep", sep); Datetime sep; testInit (t, "sep", sep);
Variant oct; testInit (t, "oct", oct); Datetime oct; testInit (t, "oct", oct);
Variant nov; testInit (t, "nov", nov); Datetime nov; testInit (t, "nov", nov);
Variant dec; testInit (t, "dec", dec); Datetime dec; testInit (t, "dec", dec);
t.ok (january == jan, "january == jan"); t.ok (january == jan, "january == jan");
t.ok (february == feb, "february == feb"); t.ok (february == feb, "february == feb");
@@ -120,51 +117,47 @@ int main (int, char**)
t.ok (december == dec, "december == dec"); t.ok (december == dec, "december == dec");
// Simply instantiate these for now. Test later. // Simply instantiate these for now. Test later.
Variant now; testInit (t, "now", now); Datetime now; testInit (t, "now", now);
Variant today; testInit (t, "today", today); Datetime today; testInit (t, "today", today);
Variant sod; testInit (t, "sod", sod); Datetime sod; testInit (t, "sod", sod);
Variant yesterday; testInit (t, "yesterday", yesterday); Datetime yesterday; testInit (t, "yesterday", yesterday);
Variant tomorrow; testInit (t, "tomorrow", tomorrow); Datetime tomorrow; testInit (t, "tomorrow", tomorrow);
Variant eod; testInit (t, "eod", eod); Datetime eod; testInit (t, "eod", eod);
Variant soy; testInit (t, "soy", soy); Datetime soy; testInit (t, "soy", soy);
Variant eoy; testInit (t, "eoy", eoy); Datetime eoy; testInit (t, "eoy", eoy);
Variant socm; testInit (t, "socm", socm); Datetime socm; testInit (t, "socm", socm);
Variant eocm; testInit (t, "eocm", eocm); Datetime eocm; testInit (t, "eocm", eocm);
Variant soww; testInit (t, "soww", soww); Datetime soww; testInit (t, "soww", soww);
Variant eoww; testInit (t, "eoww", eoww); Datetime eoww; testInit (t, "eoww", eoww);
Variant som; testInit (t, "som", som); Datetime som; testInit (t, "som", som);
Variant eom; testInit (t, "eom", eom); Datetime eom; testInit (t, "eom", eom);
Variant later; testInit (t, "later", later); Datetime later; testInit (t, "later", later);
Variant someday; testInit (t, "someday", someday); Datetime someday; testInit (t, "someday", someday);
Variant easter; testInit (t, "easter", easter); Datetime easter; testInit (t, "easter", easter);
Variant eastermonday; testInit (t, "eastermonday", eastermonday); Datetime eastermonday; testInit (t, "eastermonday", eastermonday);
Variant ascension; testInit (t, "ascension", ascension); Datetime ascension; testInit (t, "ascension", ascension);
Variant pentecost; testInit (t, "pentecost", pentecost); Datetime pentecost; testInit (t, "pentecost", pentecost);
Variant goodfriday; testInit (t, "goodfriday", goodfriday); Datetime goodfriday; testInit (t, "goodfriday", goodfriday);
Variant pi; testInit (t, "pi", pi); Datetime midsommar; testInit (t, "midsommar", midsommar);
Variant var_true; testInit (t, "true", var_true); Datetime midsommarafton; testInit (t, "midsommarafton", midsommarafton);
Variant var_false; testInit (t, "false", var_false); Datetime juhannus; testInit (t, "juhannus", juhannus);
Variant midsommar; testInit (t, "midsommar", midsommar); Datetime first; testInit (t, "1st", first);
Variant midsommarafton; testInit (t, "midsommarafton", midsommarafton); Datetime second; testInit (t, "2nd", second);
Variant juhannus; testInit (t, "juhannus", juhannus); Datetime third; testInit (t, "3rd", third);
Variant first; testInit (t, "1st", first); Datetime fourth; testInit (t, "4th", fourth);
Variant second; testInit (t, "2nd", second);
Variant third; testInit (t, "3rd", third);
Variant fourth; testInit (t, "4th", fourth);
// Check abbreviations. // Check abbreviations.
// TW-1515: abbreviation.minimum does not apply to date recognition // TW-1515: abbreviation.minimum does not apply to date recognition
Variant yesterday2; testInit (t, "yesterday", yesterday2); Datetime yesterday2; testInit (t, "yesterday", yesterday2);
Variant yesterday3; testInit (t, "yesterda", yesterday3); Datetime yesterday3; testInit (t, "yesterda", yesterday3);
Variant yesterday4; testInit (t, "yesterd", yesterday4); Datetime yesterday4; testInit (t, "yesterd", yesterday4);
Variant yesterday5; testInit (t, "yester", yesterday5); Datetime yesterday5; testInit (t, "yester", yesterday5);
Variant yesterday6; testInit (t, "yeste", yesterday6); Datetime yesterday6; testInit (t, "yeste", yesterday6);
Variant yesterday7; testInit (t, "yest", yesterday7); Datetime yesterday7; testInit (t, "yest", yesterday7);
Variant yesterday8; testInit (t, "yes", yesterday8); Datetime yesterday8; testInit (t, "yes", yesterday8);
t.ok (now >= today, "now >= today"); t.ok (now >= today, "now >= today");
t.ok (sod == tomorrow, "sod == tomorrow"); t.ok (sod == tomorrow, "sod == tomorrow");
t.ok (sod > eod, "sod > eod");
t.ok (yesterday < today, "yesterday < today"); t.ok (yesterday < today, "yesterday < today");
t.ok (today < tomorrow, "today < tomorrow"); t.ok (today < tomorrow, "today < tomorrow");
t.ok (socm < eocm, "socm < eocm"); t.ok (socm < eocm, "socm < eocm");