From 799e62051f8bd653c46104a2df3b7dd45f42a0b1 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 5 Oct 2015 09:54:02 -0400 Subject: [PATCH] Test: Removed Date --- test/.gitignore | 1 - test/CMakeLists.txt | 8 +- test/date.t.cpp | 443 -------------------------------------------- test/nibbler.t.cpp | 30 +-- 4 files changed, 19 insertions(+), 463 deletions(-) delete mode 100644 test/date.t.cpp diff --git a/test/.gitignore b/test/.gitignore index c200666f2..7b83e1fb3 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -7,7 +7,6 @@ autocomplete.t col.t color.t config.t -date.t dates.t eval.t fs.t diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d2021ed42..04d808aae 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,15 +9,15 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/test ${TASK_INCLUDE_DIRS}) -set (test_SRCS autocomplete.t col.t color.t config.t date.t fs.t i18n.t json.t - list.t msg.t nibbler.t rx.t t.t t2.t t3.t tdb2.t text.t utf8.t - util.t view.t json_test lexer.t iso8601d.t iso8601p.t eval.t +set (test_SRCS autocomplete.t col.t color.t config.t fs.t i18n.t json.t list.t + msg.t nibbler.t rx.t t.t t2.t t3.t tdb2.t text.t utf8.t util.t + view.t json_test lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t - variant_subtract.t variant_xor.t dates.t) + variant_subtract.t variant_xor.t) add_custom_target (test ./run_all --verbose DEPENDS ${test_SRCS} task_executable diff --git a/test/date.t.cpp b/test/date.t.cpp deleted file mode 100644 index 76e1d1010..000000000 --- a/test/date.t.cpp +++ /dev/null @@ -1,443 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// http://www.opensource.org/licenses/mit-license.php -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include -#include -#include - -Context context; - -//////////////////////////////////////////////////////////////////////////////// -int main (int argc, char** argv) -{ - UnitTest t (203); - - // Ensure environment has no influence. - unsetenv ("TASKDATA"); - unsetenv ("TASKRC"); - - try - { - Date now; - Date yesterday; - yesterday -= 86400; - Date tomorrow; - tomorrow += 86400; - - t.ok (yesterday <= now, "yesterday <= now"); - t.ok (yesterday < now, "yesterday < now"); - t.notok (yesterday == now, "!(yesterday == now)"); - t.ok (yesterday != now, "yesterday != now"); - t.ok (now >= yesterday, "now >= yesterday"); - t.ok (now > yesterday, "now > yesterday"); - - t.ok (tomorrow >= now, "tomorrow >= now"); - t.ok (tomorrow > now, "tomorrow > now"); - t.notok (tomorrow == now, "!(tomorrow == now)"); - t.ok (tomorrow != now, "tomorrow != now"); - t.ok (now <= tomorrow, "now <= tomorrow"); - t.ok (now < tomorrow, "now < tomorrow"); - - // Date::Date ("now") - context.config.set ("weekstart", "monday"); - Date relative_now ("now"); - t.ok (relative_now.sameHour (now), "Date ().sameHour (Date (now))"); - t.ok (relative_now.sameDay (now), "Date ().sameDay (Date (now))"); - t.ok (relative_now.sameWeek (now), "Date ().sameWeek (Date (now))"); - t.ok (relative_now.sameMonth (now), "Date ().sameMonth (Date (now))"); - t.ok (relative_now.sameYear (now), "Date ().sameYear (Date (now))"); - - // Loose comparisons. - Date left ("7/4/2008"); - Date comp1 ("7/4/2008"); - t.ok (left.sameDay (comp1), "7/4/2008 is on the same day as 7/4/2008"); - t.ok (left.sameWeek (comp1), "7/4/2008 is on the same week as 7/4/2008"); - t.ok (left.sameMonth (comp1), "7/4/2008 is in the same month as 7/4/2008"); - t.ok (left.sameYear (comp1), "7/4/2008 is in the same year as 7/4/2008"); - - Date comp2 ("7/5/2008"); - t.notok (left.sameDay (comp2), "7/4/2008 is not on the same day as 7/5/2008"); - t.ok (left.sameMonth (comp2), "7/4/2008 is in the same month as 7/5/2008"); - t.ok (left.sameYear (comp2), "7/4/2008 is in the same year as 7/5/2008"); - - Date comp3 ("8/4/2008"); - t.notok (left.sameDay (comp3), "7/4/2008 is not on the same day as 8/4/2008"); - t.notok (left.sameWeek (comp3), "7/4/2008 is not on the same week as 8/4/2008"); - t.notok (left.sameMonth (comp3), "7/4/2008 is not in the same month as 8/4/2008"); - t.ok (left.sameYear (comp3), "7/4/2008 is in the same year as 8/4/2008"); - - Date comp4 ("7/4/2009"); - t.notok (left.sameDay (comp4), "7/4/2008 is not on the same day as 7/4/2009"); - t.notok (left.sameWeek (comp3), "7/4/2008 is not on the same week as 7/4/2009"); - t.notok (left.sameMonth (comp4), "7/4/2008 is not in the same month as 7/4/2009"); - t.notok (left.sameYear (comp4), "7/4/2008 is not in the same year as 7/4/2009"); - - // Validity. - t.ok (Date::valid (2, 29, 2008), "valid: 2/29/2008"); - t.notok (Date::valid (2, 29, 2007), "invalid: 2/29/2007"); - - t.ok (Date::valid ("2/29/2008"), "valid: 2/29/2008"); - t.notok (Date::valid ("2/29/2007"), "invalid: 2/29/2007"); - - t.ok (Date::valid (366, 2008), "valid: 366 days in 2008"); - t.notok (Date::valid (366, 2007), "invalid: 366 days in 2007"); - - // Time validity. - t.ok (Date::valid (2, 28, 2010, 0, 0, 0), "valid 2/28/2010 0:00:00"); - t.ok (Date::valid (2, 28, 2010, 23, 59, 59), "valid 2/28/2010 23:59:59"); - t.notok (Date::valid (2, 28, 2010, 24, 59, 59), "valid 2/28/2010 24:59:59"); - t.notok (Date::valid (2, 28, 2010, -1, 0, 0), "valid 2/28/2010 -1:00:00"); - - // Leap year. - t.ok (Date::leapYear (2008), "2008 is a leap year"); - t.notok (Date::leapYear (2007), "2007 is not a leap year"); - t.ok (Date::leapYear (2000), "2000 is a leap year"); - t.notok (Date::leapYear (1900), "1900 is not a leap year"); - - // Days in month. - t.is (Date::daysInMonth (2, 2008), 29, "29 days in February 2008"); - t.is (Date::daysInMonth (2, 2007), 28, "28 days in February 2007"); - - // Names. - t.is (Date::monthName (1), "January", "1 = January"); - t.is (Date::monthName (2), "February", "2 = February"); - t.is (Date::monthName (3), "March", "3 = March"); - t.is (Date::monthName (4), "April", "4 = April"); - t.is (Date::monthName (5), "May", "5 = May"); - t.is (Date::monthName (6), "June", "6 = June"); - t.is (Date::monthName (7), "July", "7 = July"); - t.is (Date::monthName (8), "August", "8 = August"); - t.is (Date::monthName (9), "September", "9 = September"); - t.is (Date::monthName (10), "October", "10 = October"); - t.is (Date::monthName (11), "November", "11 = November"); - t.is (Date::monthName (12), "December", "12 = December"); - - t.is (Date::dayName (0), "Sunday", "0 == Sunday"); - t.is (Date::dayName (1), "Monday", "1 == Monday"); - t.is (Date::dayName (2), "Tuesday", "2 == Tuesday"); - t.is (Date::dayName (3), "Wednesday", "3 == Wednesday"); - t.is (Date::dayName (4), "Thursday", "4 == Thursday"); - t.is (Date::dayName (5), "Friday", "5 == Friday"); - t.is (Date::dayName (6), "Saturday", "6 == Saturday"); - - t.is (Date::dayOfWeek ("SUNDAY"), 0, "SUNDAY == 0"); - t.is (Date::dayOfWeek ("sunday"), 0, "sunday == 0"); - t.is (Date::dayOfWeek ("Sunday"), 0, "Sunday == 0"); - t.is (Date::dayOfWeek ("Monday"), 1, "Monday == 1"); - t.is (Date::dayOfWeek ("Tuesday"), 2, "Tuesday == 2"); - t.is (Date::dayOfWeek ("Wednesday"), 3, "Wednesday == 3"); - t.is (Date::dayOfWeek ("Thursday"), 4, "Thursday == 4"); - t.is (Date::dayOfWeek ("Friday"), 5, "Friday == 5"); - t.is (Date::dayOfWeek ("Saturday"), 6, "Saturday == 6"); - - Date happyNewYear (1, 1, 2008); - t.is (happyNewYear.dayOfWeek (), 2, "1/1/2008 == Tuesday"); - t.is (happyNewYear.month (), 1, "1/1/2008 == January"); - t.is (happyNewYear.day (), 1, "1/1/2008 == 1"); - t.is (happyNewYear.year (), 2008, "1/1/2008 == 2008"); - - t.is (happyNewYear.toString (), "1/1/2008", "toString 1/1/2008"); - - int m, d, y; - happyNewYear.toMDY (m, d, y); - t.is (m, 1, "1/1/2008 == January"); - t.is (d, 1, "1/1/2008 == 1"); - t.is (y, 2008, "1/1/2008 == 2008"); - - Date epoch (9, 8, 2001); - t.ok ((int)epoch.toEpoch () < 1000000000, "9/8/2001 < 1,000,000,000"); - epoch += 172800; - t.ok ((int)epoch.toEpoch () > 1000000000, "9/10/2001 > 1,000,000,000"); - - Date fromEpoch (epoch.toEpoch ()); - t.is (fromEpoch.toString (), epoch.toString (), "ctor (time_t)"); - - Date iso (1000000000); - t.is (iso.toISO (), "20010909T014640Z", "1,000,000,000 -> 20010909T014640Z"); - - // Quantization. - Date quant (1234526400); - t.is (quant.startOfDay ().toString ("YMDHNS"), "20090213000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/13/2009 0:00:00"); - t.is (quant.startOfWeek ().toString ("YMDHNS"), "20090208000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/8/2009 0:00:00"); - t.is (quant.startOfMonth ().toString ("YMDHNS"), "20090201000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/1/2009 0:00:00"); - t.is (quant.startOfYear ().toString ("YMDHNS"), "20090101000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 1/1/2009 0:00:00"); - - // Date parsing. - Date fromString1 ("1/1/2008"); - t.is (fromString1.month (), 1, "ctor (std::string) -> m"); - t.is (fromString1.day (), 1, "ctor (std::string) -> d"); - t.is (fromString1.year (), 2008, "ctor (std::string) -> y"); - - Date fromString2 ("1/1/2008", "m/d/Y"); - t.is (fromString2.month (), 1, "ctor (std::string) -> m"); - t.is (fromString2.day (), 1, "ctor (std::string) -> d"); - t.is (fromString2.year (), 2008, "ctor (std::string) -> y"); - - Date fromString3 ("20080101", "YMD"); - t.is (fromString3.month (), 1, "ctor (std::string) -> m"); - t.is (fromString3.day (), 1, "ctor (std::string) -> d"); - t.is (fromString3.year (), 2008, "ctor (std::string) -> y"); - - Date fromString4 ("12/31/2007"); - t.is (fromString4.month (), 12, "ctor (std::string) -> m"); - t.is (fromString4.day (), 31, "ctor (std::string) -> d"); - t.is (fromString4.year (), 2007, "ctor (std::string) -> y"); - - Date fromString5 ("12/31/2007", "m/d/Y"); - t.is (fromString5.month (), 12, "ctor (std::string) -> m"); - t.is (fromString5.day (), 31, "ctor (std::string) -> d"); - t.is (fromString5.year (), 2007, "ctor (std::string) -> y"); - - Date fromString6 ("20071231", "YMD"); - t.is (fromString6.month (), 12, "ctor (std::string) -> m"); - t.is (fromString6.day (), 31, "ctor (std::string) -> d"); - t.is (fromString6.year (), 2007, "ctor (std::string) -> y"); - - Date fromString7 ("01/01/2008", "m/d/Y"); - t.is (fromString7.month (), 1, "ctor (std::string) -> m"); - t.is (fromString7.day (), 1, "ctor (std::string) -> d"); - t.is (fromString7.year (), 2008, "ctor (std::string) -> y"); - - Date fromString8 ("Tue 05 Feb 2008 (06)", "a D b Y (V)"); - t.is (fromString8.month (), 2, "ctor (std::string) -> m"); - t.is (fromString8.day (), 5, "ctor (std::string) -> d"); - t.is (fromString8.year (), 2008, "ctor (std::string) -> y"); - - Date fromString9 ("Tuesday, February 5, 2008", "A, B d, Y"); - t.is (fromString9.month (), 2, "ctor (std::string) -> m"); - t.is (fromString9.day (), 5, "ctor (std::string) -> d"); - t.is (fromString9.year (), 2008, "ctor (std::string) -> y"); - - Date fromString10 ("w01 Tue 2008-01-01", "wV a Y-M-D"); - t.is (fromString10.month (), 1, "ctor (std::string) -> m"); - t.is (fromString10.day (), 1, "ctor (std::string) -> d"); - t.is (fromString10.year (), 2008, "ctor (std::string) -> y"); - - Date fromString11 ("6/7/2010 1:23:45", "m/d/Y h:N:S"); - t.is (fromString11.month (), 6, "ctor (std::string) -> m"); - t.is (fromString11.day (), 7, "ctor (std::string) -> d"); - t.is (fromString11.year (), 2010, "ctor (std::string) -> Y"); - t.is (fromString11.hour (), 1, "ctor (std::string) -> h"); - t.is (fromString11.minute (), 23, "ctor (std::string) -> N"); - t.is (fromString11.second (), 45, "ctor (std::string) -> S"); - - Date fromString12 ("6/7/2010 01:23:45", "m/d/Y H:N:S"); - t.is (fromString12.month (), 6, "ctor (std::string) -> m"); - t.is (fromString12.day (), 7, "ctor (std::string) -> d"); - t.is (fromString12.year (), 2010, "ctor (std::string) -> Y"); - t.is (fromString12.hour (), 1, "ctor (std::string) -> h"); - t.is (fromString12.minute (), 23, "ctor (std::string) -> N"); - t.is (fromString12.second (), 45, "ctor (std::string) -> S"); - - Date fromString13 ("6/7/2010 12:34:56", "m/d/Y H:N:S"); - t.is (fromString13.month (), 6, "ctor (std::string) -> m"); - t.is (fromString13.day (), 7, "ctor (std::string) -> d"); - t.is (fromString13.year (), 2010, "ctor (std::string) -> Y"); - t.is (fromString13.hour (), 12, "ctor (std::string) -> h"); - t.is (fromString13.minute (), 34, "ctor (std::string) -> N"); - t.is (fromString13.second (), 56, "ctor (std::string) -> S"); - - // Day of year - t.is (Date ("1/1/2011", "m/d/Y").dayOfYear (), 1, "dayOfYear (1/1/2011) -> 1"); - t.is (Date ("5/1/2011", "m/d/Y").dayOfYear (), 121, "dayOfYear (5/1/2011) -> 121"); - t.is (Date ("12/31/2011", "m/d/Y").dayOfYear (), 365, "dayOfYear (12/31/2011) -> 365"); - - // Relative dates. - Date r1 ("today"); - t.ok (r1.sameDay (now), "today = now"); - - Date r4 ("sunday"); - if (now.dayOfWeek () >= 0) - t.ok (r4.sameDay (now + (0 - now.dayOfWeek () + 7) * 86400), "next sunday"); - else - t.ok (r4.sameDay (now + (0 - now.dayOfWeek ()) * 86400), "next sunday");; - - Date r5 ("monday"); - if (now.dayOfWeek () >= 1) - t.ok (r5.sameDay (now + (1 - now.dayOfWeek () + 7) * 86400), "next monday"); - else - t.ok (r5.sameDay (now + (1 - now.dayOfWeek ()) * 86400), "next monday");; - - Date r6 ("tuesday"); - if (now.dayOfWeek () >= 2) - t.ok (r6.sameDay (now + (2 - now.dayOfWeek () + 7) * 86400), "next tuesday"); - else - t.ok (r6.sameDay (now + (2 - now.dayOfWeek ()) * 86400), "next tuesday");; - - Date r7 ("wednesday"); - if (now.dayOfWeek () >= 3) - t.ok (r7.sameDay (now + (3 - now.dayOfWeek () + 7) * 86400), "next wednesday"); - else - t.ok (r7.sameDay (now + (3 - now.dayOfWeek ()) * 86400), "next wednesday");; - - Date r8 ("thursday"); - if (now.dayOfWeek () >= 4) - t.ok (r8.sameDay (now + (4 - now.dayOfWeek () + 7) * 86400), "next thursday"); - else - t.ok (r8.sameDay (now + (4 - now.dayOfWeek ()) * 86400), "next thursday");; - - Date r9 ("friday"); - if (now.dayOfWeek () >= 5) - t.ok (r9.sameDay (now + (5 - now.dayOfWeek () + 7) * 86400), "next friday"); - else - t.ok (r9.sameDay (now + (5 - now.dayOfWeek ()) * 86400), "next friday");; - - Date r10 ("saturday"); - if (now.dayOfWeek () >= 6) - t.ok (r10.sameDay (now + (6 - now.dayOfWeek () + 7) * 86400), "next saturday"); - else - t.ok (r10.sameDay (now + (6 - now.dayOfWeek ()) * 86400), "next saturday");; - - Date r11 ("eow"); - t.ok (r11 < now + (8 * 86400), "eow < 7 days away"); - - Date r12 ("eocw"); - t.ok (r12 > now - (8 * 86400), "eocw < 7 days in the past"); - - Date r13 ("eom"); - t.ok (r13.sameMonth (now), "eom in same month as now"); - - Date r14 ("eocm"); - t.ok (r14.sameMonth (now), "eocm in same month as now"); - - Date r15 ("eoy"); - t.ok (r15.sameYear (now), "eoy in same year as now"); - - Date r16 ("sow"); - t.ok (r16 < now + (8 * 86400), "sow < 7 days away"); - - Date r23 ("socw"); - t.ok (r23 > now - (8 * 86400), "sow < 7 days in the past"); - - Date r17 ("som"); - t.notok (r17.sameMonth (now), "som not in same month as now"); - - Date r18 ("socm"); - t.ok (r18.sameMonth (now), "socm in same month as now"); - - Date r19 ("soy"); - t.notok (r19.sameYear (now), "soy not in same year as now"); - - Date first ("1st"); - t.notok (first.sameMonth (now), "1st not in same month as now"); - t.is (first.day (), 1, "1st day is 1"); - - Date later ("later"); - t.is (later.month (), 1, "later -> m = 1"); - t.is (later.day (), 18, "later -> d = 18"); - t.is (later.year (), 2038, "later -> y = 2038"); - - // Quarters - Date soq ("soq"); - Date eoq ("eoq"); - t.is (soq.day (), 1, "soq is the first day of a month"); - t.is (eoq.day () / 10, 3, "eoq is the 30th or 31th of a month"); - t.is (soq.month () % 3, 1, "soq month is 1, 4, 7 or 10"); - t.is (eoq.month () % 3, 0, "eoq month is 3, 6, 9 or 12"); - - // Note: these fail during the night of daylight savings end. - t.ok (soq.sameYear (now) || - (now.month () >= 10 && - soq.year () == now.year () + 1), "soq is in same year as now"); - t.ok (eoq.sameYear (now), "eoq is in same year as now"); - - // Date::sameHour - Date r20 ("6/7/2010 01:00:00", "m/d/Y H:N:S"); - Date r21 ("6/7/2010 01:59:59", "m/d/Y H:N:S"); - t.ok (r20.sameHour (r21), "two dates within the same hour"); - - Date r22 ("6/7/2010 00:59:59", "m/d/Y H:N:S"); - t.notok (r20.sameHour (r22), "two dates not within the same hour"); - - // Date::operator- - Date r25 (1234567890); - t.is ((r25 - 1).toEpoch (), 1234567889, "1234567890 - 1 = 1234567889"); - - // Date::operator-- - Date r26 (11, 7, 2010, 23, 59, 59); - r26--; - t.is (r26.toString ("YMDHNS"), "20101106235959", "decrement across fall DST boundary"); - - Date r27 (3, 14, 2010, 23, 59, 59); - r27--; - t.is (r27.toString ("YMDHNS"), "20100313235959", "decrement across spring DST boundary"); - - // Date::operator++ - Date r28 (11, 6, 2010, 23, 59, 59); - r28++; - t.is (r28.toString ("YMDHNS"), "20101107235959", "increment across fall DST boundary"); - - Date r29 (3, 13, 2010, 23, 59, 59); - r29++; - t.is (r29.toString ("YMDHNS"), "20100314235959", "increment across spring DST boundary"); - - // int Date::length (const std::string&); - t.is (Date::length ("m"), 2, "length 'm' --> 2"); - t.is (Date::length ("M"), 2, "length 'M' --> 2"); - t.is (Date::length ("d"), 2, "length 'd' --> 2"); - t.is (Date::length ("D"), 2, "length 'D' --> 2"); - t.is (Date::length ("y"), 2, "length 'y' --> 2"); - t.is (Date::length ("Y"), 4, "length 'Y' --> 4"); - t.is (Date::length ("a"), 3, "length 'a' --> 3"); - t.is (Date::length ("A"), 10, "length 'A' --> 10"); - t.is (Date::length ("b"), 3, "length 'b' --> 3"); - t.is (Date::length ("B"), 10, "length 'B' --> 10"); - t.is (Date::length ("v"), 2, "length 'v' --> 2"); - t.is (Date::length ("V"), 2, "length 'V' --> 2"); - t.is (Date::length ("h"), 2, "length 'h' --> 2"); - t.is (Date::length ("H"), 2, "length 'H' --> 2"); - t.is (Date::length ("n"), 2, "length 'n' --> 2"); - t.is (Date::length ("N"), 2, "length 'N' --> 2"); - t.is (Date::length ("s"), 2, "length 's' --> 2"); - t.is (Date::length ("S"), 2, "length 'S' --> 2"); - t.is (Date::length ("j"), 3, "length 'j' --> 3"); - t.is (Date::length ("J"), 3, "length 'J' --> 3"); - - t.is (Date::length (" "), 1, "length ' ' --> 1"); - - // Depletion requirement. - Date r30 ("Mon Jun 30 2014", "a b D Y", false, false); - t.is (r30.toString ("YMDHNS"), "20140630000000", "Depletion required on complex format with spaces"); - - std::string::size_type i = 0; - Date r31 ("Mon Jun 30 2014 xxx", i, "a b D Y", false, false); - t.is (r31.toString ("YMDHNS"), "20140630000000", "Depletion not required on complex format with spaces"); - t.is ((int)i, 15, "Depletion not required on complex format with spaces, 15 chars"); - } - - catch (const std::string& e) - { - t.fail ("Exception thrown."); - t.diag (e); - } - - return 0; -} - -//////////////////////////////////////////////////////////////////////////////// diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp index 29e22a8c4..040a4e755 100644 --- a/test/nibbler.t.cpp +++ b/test/nibbler.t.cpp @@ -29,7 +29,7 @@ #include #include #ifdef NIBBLER_FEATURE_DATE -#include +#include #endif #include @@ -65,7 +65,7 @@ int main (int argc, char** argv) time_t ti; #ifdef NIBBLER_FEATURE_DATE - Date dt; + ISO8601d dt; #endif std::vector options; @@ -533,56 +533,56 @@ int main (int argc, char** argv) t.diag ("Nibbler::getDate"); n = Nibbler ("1/1/2008"); t.ok (n.getDate ("m/d/Y", ti), "m/d/Y ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2008, "ctor (std::string) -> y"); n = Nibbler ("20080101"); t.ok (n.getDate ("YMD", ti), "YMD ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2008, "ctor (std::string) -> y"); n = Nibbler ("12/31/2007"); t.ok (n.getDate ("m/d/Y", ti), "m/d/Y ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 12, "ctor (std::string) -> m"); t.is (dt.day (), 31, "ctor (std::string) -> d"); t.is (dt.year (), 2007, "ctor (std::string) -> y"); n = Nibbler ("20071231"); t.ok (n.getDate ("YMD", ti), "YMD ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 12, "ctor (std::string) -> m"); t.is (dt.day (), 31, "ctor (std::string) -> d"); t.is (dt.year (), 2007, "ctor (std::string) -> y"); n = Nibbler ("Tue 01 Jan 2008 (01)"); t.ok (n.getDate ("a D b Y (V)", ti), "a D b Y (V)"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2008, "ctor (std::string) -> y"); n = Nibbler ("Tuesday, January 1, 2008"); t.ok (n.getDate ("A, B d, Y", ti), "A, B d, Y ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2008, "ctor (std::string) -> y"); n = Nibbler ("w01 Tue 2008-01-01"); t.ok (n.getDate ("wV a Y-M-D", ti), "wV a Y-M-D ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2008, "ctor (std::string) -> y"); n = Nibbler ("6/7/2010 1:23:45"); t.ok (n.getDate ("m/d/Y h:N:S", ti), "m/d/Y h:N:S ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 6, "ctor (std::string) -> m"); t.is (dt.day (), 7, "ctor (std::string) -> d"); t.is (dt.year (), 2010, "ctor (std::string) -> Y"); @@ -592,7 +592,7 @@ int main (int argc, char** argv) n = Nibbler ("6/7/2010 01:23:45"); t.ok (n.getDate ("m/d/Y H:N:S", ti), "m/d/Y H:N:S ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 6, "ctor (std::string) -> m"); t.is (dt.day (), 7, "ctor (std::string) -> d"); t.is (dt.year (), 2010, "ctor (std::string) -> Y"); @@ -602,7 +602,7 @@ int main (int argc, char** argv) n = Nibbler ("6/7/2010 12:34:56"); t.ok (n.getDate ("m/d/Y H:N:S", ti), "m/d/Y H:N:S ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 6, "ctor (std::string) -> m"); t.is (dt.day (), 7, "ctor (std::string) -> d"); t.is (dt.year (), 2010, "ctor (std::string) -> Y"); @@ -612,7 +612,7 @@ int main (int argc, char** argv) n = Nibbler ("2010"); t.ok (n.getDate ("Y", ti), "Y ok"); - dt = Date (ti); + dt = ISO8601d (ti); t.is (dt.month (), 1, "ctor (std::string) -> m"); t.is (dt.day (), 1, "ctor (std::string) -> d"); t.is (dt.year (), 2010, "ctor (std::string) -> Y"); @@ -622,8 +622,8 @@ int main (int argc, char** argv) n = Nibbler ("17:18:19"); t.ok (n.getDate ("H:N:S", ti), "H:N:S ok"); - dt = Date (ti); - Date now = Date (); + dt = ISO8601d (ti); + ISO8601d now; t.is (dt.month (), now.month(), "ctor (std::string) -> m"); t.is (dt.day (), now.day(), "ctor (std::string) -> d"); t.is (dt.year (), now.year(), "ctor (std::string) -> Y");