X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/804eeca5d59fc4d3822b719dee61a9d491e6bcfc..93a800a95e67a38284a2980543c4b0b1a792573c:/tests/datetime/datetimetest.cpp diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index 8c584dd659..f4f87df2f4 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -23,12 +23,11 @@ #if wxUSE_DATETIME #include "wx/datetime.h" -#include "wx/ioswrap.h" // need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects -static wxSTD ostream& operator<<(wxSTD ostream& ostr, const wxDateTime& dt) +static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) { - ostr << dt.FormatISODate() << _T(" ") << dt.FormatISOTime(); + ostr << dt.FormatISOCombined(' '); return ostr; } @@ -93,7 +92,7 @@ struct Date wxDateTime::wxDateTime_t hour, min, sec; double jdn; wxDateTime::WeekDay wday; - time_t gmticks, ticks; + time_t gmticks; void Init(const wxDateTime::Tm& tm) { @@ -104,7 +103,7 @@ struct Date min = tm.min; sec = tm.sec; jdn = 0.0; - gmticks = ticks = -1; + gmticks = -1; } wxDateTime DT() const @@ -145,25 +144,25 @@ struct Date static const Date testDates[] = { - { 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0, -3600 }, - { 7, wxDateTime::Feb, 2036, 00, 00, 00, 2464730.5, wxDateTime::Thu, -1, -1 }, - { 8, wxDateTime::Feb, 2036, 00, 00, 00, 2464731.5, wxDateTime::Fri, -1, -1 }, - { 1, wxDateTime::Jan, 2037, 00, 00, 00, 2465059.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 2038, 00, 00, 00, 2465424.5, wxDateTime::Fri, -1, -1 }, - { 21, wxDateTime::Jan, 2222, 00, 00, 00, 2532648.5, wxDateTime::Mon, -1, -1 }, - { 29, wxDateTime::May, 1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200, 202212000 }, - { 29, wxDateTime::Feb, 1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000, 194396400 }, - { 1, wxDateTime::Jan, 1900, 12, 00, 00, 2415021.0, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Jan, 1900, 00, 00, 00, 2415020.5, wxDateTime::Mon, -1, -1 }, - { 15, wxDateTime::Oct, 1582, 00, 00, 00, 2299160.5, wxDateTime::Fri, -1, -1 }, - { 4, wxDateTime::Oct, 1582, 00, 00, 00, 2299149.5, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Mar, 1, 00, 00, 00, 1721484.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 1, 00, 00, 00, 1721425.5, wxDateTime::Mon, -1, -1 }, - { 31, wxDateTime::Dec, 0, 00, 00, 00, 1721424.5, wxDateTime::Sun, -1, -1 }, - { 1, wxDateTime::Jan, 0, 00, 00, 00, 1721059.5, wxDateTime::Sat, -1, -1 }, - { 12, wxDateTime::Aug, -1234, 00, 00, 00, 1270573.5, wxDateTime::Fri, -1, -1 }, - { 12, wxDateTime::Aug, -4000, 00, 00, 00, 260313.5, wxDateTime::Sat, -1, -1 }, - { 24, wxDateTime::Nov, -4713, 00, 00, 00, -0.5, wxDateTime::Mon, -1, -1 }, + { 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0 }, + { 7, wxDateTime::Feb, 2036, 00, 00, 00, 2464730.5, wxDateTime::Thu, -1 }, + { 8, wxDateTime::Feb, 2036, 00, 00, 00, 2464731.5, wxDateTime::Fri, -1 }, + { 1, wxDateTime::Jan, 2037, 00, 00, 00, 2465059.5, wxDateTime::Thu, -1 }, + { 1, wxDateTime::Jan, 2038, 00, 00, 00, 2465424.5, wxDateTime::Fri, -1 }, + { 21, wxDateTime::Jan, 2222, 00, 00, 00, 2532648.5, wxDateTime::Mon, -1 }, + { 29, wxDateTime::May, 1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200 }, + { 29, wxDateTime::Feb, 1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000 }, + { 1, wxDateTime::Jan, 1900, 12, 00, 00, 2415021.0, wxDateTime::Mon, -1 }, + { 1, wxDateTime::Jan, 1900, 00, 00, 00, 2415020.5, wxDateTime::Mon, -1 }, + { 15, wxDateTime::Oct, 1582, 00, 00, 00, 2299160.5, wxDateTime::Fri, -1 }, + { 4, wxDateTime::Oct, 1582, 00, 00, 00, 2299149.5, wxDateTime::Mon, -1 }, + { 1, wxDateTime::Mar, 1, 00, 00, 00, 1721484.5, wxDateTime::Thu, -1 }, + { 1, wxDateTime::Jan, 1, 00, 00, 00, 1721425.5, wxDateTime::Mon, -1 }, + { 31, wxDateTime::Dec, 0, 00, 00, 00, 1721424.5, wxDateTime::Sun, -1 }, + { 1, wxDateTime::Jan, 0, 00, 00, 00, 1721059.5, wxDateTime::Sat, -1 }, + { 12, wxDateTime::Aug, -1234, 00, 00, 00, 1270573.5, wxDateTime::Fri, -1 }, + { 12, wxDateTime::Aug, -4000, 00, 00, 00, 260313.5, wxDateTime::Sat, -1 }, + { 24, wxDateTime::Nov, -4713, 00, 00, 00, -0.5, wxDateTime::Mon, -1 }, }; @@ -189,6 +188,7 @@ private: CPPUNIT_TEST( TestTimeTicks ); CPPUNIT_TEST( TestParceRFC822 ); CPPUNIT_TEST( TestDateParse ); + CPPUNIT_TEST( TestDateParseISO ); CPPUNIT_TEST( TestDateTimeParse ); CPPUNIT_TEST( TestTimeArithmetics ); CPPUNIT_TEST( TestDSTBug ); @@ -206,6 +206,7 @@ private: void TestTimeTicks(); void TestParceRFC822(); void TestDateParse(); + void TestDateParseISO(); void TestDateTimeParse(); void TestTimeArithmetics(); void TestDSTBug(); @@ -280,10 +281,10 @@ void DateTimeTestCase::TestTimeJDN() // JDNs must be computed for UTC times double jdn = dt.FromUTC().GetJulianDayNumber(); - CPPUNIT_ASSERT( jdn == d.jdn ); + CPPUNIT_ASSERT_EQUAL( d.jdn, jdn ); dt.Set(jdn); - CPPUNIT_ASSERT( dt.GetJulianDayNumber() == jdn ); + CPPUNIT_ASSERT_EQUAL( jdn, dt.GetJulianDayNumber() ); } } @@ -372,26 +373,26 @@ for n in range(20): static const WeekDateTestData weekDatesTestData[] = { - { { 20, wxDateTime::Mar, 2045, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 3, wxDateTime::Mon, wxDateTime::Mar, 2045 }, - { { 5, wxDateTime::Jun, 1985, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -4, wxDateTime::Wed, wxDateTime::Jun, 1985 }, - { { 12, wxDateTime::Nov, 1961, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -3, wxDateTime::Sun, wxDateTime::Nov, 1961 }, - { { 27, wxDateTime::Feb, 2093, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -1, wxDateTime::Fri, wxDateTime::Feb, 2093 }, - { { 4, wxDateTime::Jul, 2070, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -4, wxDateTime::Fri, wxDateTime::Jul, 2070 }, - { { 2, wxDateTime::Apr, 1906, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -5, wxDateTime::Mon, wxDateTime::Apr, 1906 }, - { { 19, wxDateTime::Jul, 2023, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -2, wxDateTime::Wed, wxDateTime::Jul, 2023 }, - { { 5, wxDateTime::May, 1958, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -4, wxDateTime::Mon, wxDateTime::May, 1958 }, - { { 11, wxDateTime::Aug, 1900, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 2, wxDateTime::Sat, wxDateTime::Aug, 1900 }, - { { 14, wxDateTime::Feb, 1945, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 2, wxDateTime::Wed, wxDateTime::Feb, 1945 }, - { { 25, wxDateTime::Jul, 1967, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -1, wxDateTime::Tue, wxDateTime::Jul, 1967 }, - { { 9, wxDateTime::May, 1916, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -4, wxDateTime::Tue, wxDateTime::May, 1916 }, - { { 20, wxDateTime::Jun, 1927, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 3, wxDateTime::Mon, wxDateTime::Jun, 1927 }, - { { 2, wxDateTime::Aug, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, wxDateTime::Wed, wxDateTime::Aug, 2000 }, - { { 20, wxDateTime::Apr, 2044, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 3, wxDateTime::Wed, wxDateTime::Apr, 2044 }, - { { 20, wxDateTime::Feb, 1932, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -2, wxDateTime::Sat, wxDateTime::Feb, 1932 }, - { { 25, wxDateTime::Jul, 2069, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 4, wxDateTime::Thu, wxDateTime::Jul, 2069 }, - { { 3, wxDateTime::Apr, 1925, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, wxDateTime::Fri, wxDateTime::Apr, 1925 }, - { { 21, wxDateTime::Mar, 2093, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 3, wxDateTime::Sat, wxDateTime::Mar, 2093 }, - { { 3, wxDateTime::Dec, 2074, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, -5, wxDateTime::Mon, wxDateTime::Dec, 2074 } + { { 20, wxDateTime::Mar, 2045, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 3, wxDateTime::Mon, wxDateTime::Mar, 2045 }, + { { 5, wxDateTime::Jun, 1985, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -4, wxDateTime::Wed, wxDateTime::Jun, 1985 }, + { { 12, wxDateTime::Nov, 1961, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -3, wxDateTime::Sun, wxDateTime::Nov, 1961 }, + { { 27, wxDateTime::Feb, 2093, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -1, wxDateTime::Fri, wxDateTime::Feb, 2093 }, + { { 4, wxDateTime::Jul, 2070, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -4, wxDateTime::Fri, wxDateTime::Jul, 2070 }, + { { 2, wxDateTime::Apr, 1906, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -5, wxDateTime::Mon, wxDateTime::Apr, 1906 }, + { { 19, wxDateTime::Jul, 2023, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -2, wxDateTime::Wed, wxDateTime::Jul, 2023 }, + { { 5, wxDateTime::May, 1958, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -4, wxDateTime::Mon, wxDateTime::May, 1958 }, + { { 11, wxDateTime::Aug, 1900, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 2, wxDateTime::Sat, wxDateTime::Aug, 1900 }, + { { 14, wxDateTime::Feb, 1945, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 2, wxDateTime::Wed, wxDateTime::Feb, 1945 }, + { { 25, wxDateTime::Jul, 1967, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -1, wxDateTime::Tue, wxDateTime::Jul, 1967 }, + { { 9, wxDateTime::May, 1916, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -4, wxDateTime::Tue, wxDateTime::May, 1916 }, + { { 20, wxDateTime::Jun, 1927, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 3, wxDateTime::Mon, wxDateTime::Jun, 1927 }, + { { 2, wxDateTime::Aug, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, wxDateTime::Wed, wxDateTime::Aug, 2000 }, + { { 20, wxDateTime::Apr, 2044, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 3, wxDateTime::Wed, wxDateTime::Apr, 2044 }, + { { 20, wxDateTime::Feb, 1932, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -2, wxDateTime::Sat, wxDateTime::Feb, 1932 }, + { { 25, wxDateTime::Jul, 2069, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 4, wxDateTime::Thu, wxDateTime::Jul, 2069 }, + { { 3, wxDateTime::Apr, 1925, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, wxDateTime::Fri, wxDateTime::Apr, 1925 }, + { { 21, wxDateTime::Mar, 2093, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 3, wxDateTime::Sat, wxDateTime::Mar, 2093 }, + { { 3, wxDateTime::Dec, 2074, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, -5, wxDateTime::Mon, wxDateTime::Dec, 2074 } }; wxDateTime dt; @@ -474,28 +475,28 @@ for n in range(20): */ static const WeekNumberTestData weekNumberTestDates[] = { - { { 27, wxDateTime::Dec, 1966, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 52, 5, 5, 361 }, - { { 22, wxDateTime::Jul, 1926, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 29, 4, 4, 203 }, - { { 22, wxDateTime::Oct, 2076, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 43, 4, 4, 296 }, - { { 1, wxDateTime::Jul, 1967, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 26, 1, 1, 182 }, - { { 8, wxDateTime::Nov, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 46, 2, 2, 313 }, - { { 21, wxDateTime::Mar, 1920, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 12, 3, 4, 81 }, - { { 7, wxDateTime::Jan, 1965, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, 2, 2, 7 }, - { { 19, wxDateTime::Oct, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 42, 4, 4, 292 }, - { { 13, wxDateTime::Aug, 1955, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 32, 2, 2, 225 }, - { { 18, wxDateTime::Jul, 2087, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 29, 3, 3, 199 }, - { { 2, wxDateTime::Sep, 2028, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 35, 1, 1, 246 }, - { { 28, wxDateTime::Jul, 1945, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 30, 5, 4, 209 }, - { { 15, wxDateTime::Jun, 1901, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 24, 3, 3, 166 }, - { { 10, wxDateTime::Oct, 1939, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 41, 3, 2, 283 }, - { { 3, wxDateTime::Dec, 1965, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 48, 1, 1, 337 }, - { { 23, wxDateTime::Feb, 1940, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 8, 4, 4, 54 }, - { { 2, wxDateTime::Jan, 1987, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, 1, 1, 2 }, - { { 11, wxDateTime::Aug, 2079, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 32, 2, 2, 223 }, - { { 2, wxDateTime::Feb, 2063, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 5, 1, 1, 33 }, - { { 16, wxDateTime::Oct, 1942, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 42, 3, 3, 289 }, - { { 30, wxDateTime::Dec, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, 5, 5, 364 }, - { { 2, wxDateTime::Jan, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, 1, 1, 1, 2 }, + { { 27, wxDateTime::Dec, 1966, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 52, 5, 5, 361 }, + { { 22, wxDateTime::Jul, 1926, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 29, 4, 4, 203 }, + { { 22, wxDateTime::Oct, 2076, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 43, 4, 4, 296 }, + { { 1, wxDateTime::Jul, 1967, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 26, 1, 1, 182 }, + { { 8, wxDateTime::Nov, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 46, 2, 2, 313 }, + { { 21, wxDateTime::Mar, 1920, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 12, 3, 4, 81 }, + { { 7, wxDateTime::Jan, 1965, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 2, 2, 7 }, + { { 19, wxDateTime::Oct, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 42, 4, 4, 292 }, + { { 13, wxDateTime::Aug, 1955, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 32, 2, 2, 225 }, + { { 18, wxDateTime::Jul, 2087, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 29, 3, 3, 199 }, + { { 2, wxDateTime::Sep, 2028, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 35, 1, 1, 246 }, + { { 28, wxDateTime::Jul, 1945, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 30, 5, 4, 209 }, + { { 15, wxDateTime::Jun, 1901, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 24, 3, 3, 166 }, + { { 10, wxDateTime::Oct, 1939, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 41, 3, 2, 283 }, + { { 3, wxDateTime::Dec, 1965, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 48, 1, 1, 337 }, + { { 23, wxDateTime::Feb, 1940, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 8, 4, 4, 54 }, + { { 2, wxDateTime::Jan, 1987, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 1, 1, 2 }, + { { 11, wxDateTime::Aug, 2079, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 32, 2, 2, 223 }, + { { 2, wxDateTime::Feb, 2063, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 5, 1, 1, 33 }, + { { 16, wxDateTime::Oct, 1942, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 42, 3, 3, 289 }, + { { 30, wxDateTime::Dec, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 5, 5, 364 }, + { { 2, wxDateTime::Jan, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 1, 1, 2 }, }; for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ ) @@ -536,38 +537,38 @@ void DateTimeTestCase::TestTimeDST() static const Date datesDST[2][2004 - 1900 + 1] = { { - { 1, wxDateTime::Apr, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 7, wxDateTime::Apr, 1991, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 5, wxDateTime::Apr, 1992, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 4, wxDateTime::Apr, 1993, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 3, wxDateTime::Apr, 1994, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 2, wxDateTime::Apr, 1995, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 7, wxDateTime::Apr, 1996, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 6, wxDateTime::Apr, 1997, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 5, wxDateTime::Apr, 1998, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 4, wxDateTime::Apr, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 2, wxDateTime::Apr, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 1, wxDateTime::Apr, 2001, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 7, wxDateTime::Apr, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 6, wxDateTime::Apr, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 4, wxDateTime::Apr, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, + { 1, wxDateTime::Apr, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 7, wxDateTime::Apr, 1991, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 5, wxDateTime::Apr, 1992, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 4, wxDateTime::Apr, 1993, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 3, wxDateTime::Apr, 1994, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 2, wxDateTime::Apr, 1995, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 7, wxDateTime::Apr, 1996, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 6, wxDateTime::Apr, 1997, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 5, wxDateTime::Apr, 1998, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 4, wxDateTime::Apr, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 2, wxDateTime::Apr, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 1, wxDateTime::Apr, 2001, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 7, wxDateTime::Apr, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 6, wxDateTime::Apr, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 4, wxDateTime::Apr, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, }, { - { 28, wxDateTime::Oct, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 27, wxDateTime::Oct, 1991, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 25, wxDateTime::Oct, 1992, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 31, wxDateTime::Oct, 1993, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 30, wxDateTime::Oct, 1994, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 29, wxDateTime::Oct, 1995, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 27, wxDateTime::Oct, 1996, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 26, wxDateTime::Oct, 1997, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 25, wxDateTime::Oct, 1998, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 31, wxDateTime::Oct, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 29, wxDateTime::Oct, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 28, wxDateTime::Oct, 2001, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 27, wxDateTime::Oct, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 26, wxDateTime::Oct, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, - { 31, wxDateTime::Oct, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, + { 28, wxDateTime::Oct, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 27, wxDateTime::Oct, 1991, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 25, wxDateTime::Oct, 1992, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 31, wxDateTime::Oct, 1993, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 30, wxDateTime::Oct, 1994, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 29, wxDateTime::Oct, 1995, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 27, wxDateTime::Oct, 1996, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 26, wxDateTime::Oct, 1997, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 25, wxDateTime::Oct, 1998, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 31, wxDateTime::Oct, 1999, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 29, wxDateTime::Oct, 2000, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 28, wxDateTime::Oct, 2001, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 27, wxDateTime::Oct, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 26, wxDateTime::Oct, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, + { 31, wxDateTime::Oct, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, } }; @@ -602,15 +603,15 @@ void DateTimeTestCase::TestTimeFormat() static const struct { CompareKind compareKind; - const wxChar *format; + const char *format; } formatTestFormats[] = { - { CompareYear, _T("---> %c") }, // %c could use 2 digit years - { CompareDate, _T("Date is %A, %d of %B, in year %Y") }, - { CompareYear, _T("Date is %x, time is %X") }, // %x could use 2 digits - { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") }, - { CompareNone, _T("The day of year: %j, the week of year: %W") }, - { CompareDate, _T("ISO date without separators: %Y%m%d") }, + { CompareYear, "---> %c" }, // %c could use 2 digit years + { CompareDate, "Date is %A, %d of %B, in year %Y" }, + { CompareYear, "Date is %x, time is %X" }, // %x could use 2 digits + { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" }, + { CompareNone, "The day of year: %j, the week of year: %W" }, + { CompareDate, "ISO date without separators: %Y%m%d" }, }; static const Date formatTestDates[] = @@ -633,7 +634,7 @@ void DateTimeTestCase::TestTimeFormat() wxDateTime dt = formatTestDates[d].DT(); for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ ) { - const wxChar *fmt = formatTestFormats[n].format; + const char *fmt = formatTestFormats[n].format; wxString s = dt.Format(fmt); // what can we recover? @@ -641,10 +642,10 @@ void DateTimeTestCase::TestTimeFormat() // convert back wxDateTime dt2; - const wxChar *result = dt2.ParseFormat(s.c_str(), fmt); + const char *result = dt2.ParseFormat(s, fmt); if ( !result ) { - // converion failed - should it have? + // conversion failed - should it have? CPPUNIT_ASSERT( kind == CompareNone ); } else // conversion succeeded @@ -683,6 +684,37 @@ void DateTimeTestCase::TestTimeFormat() } } } + + wxDateTime dt; + + // test partially specified dates too + wxDateTime dtDef(26, wxDateTime::Sep, 2008); + CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") ); + CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() ); + + // test compilation of some calls which should compile (and not result in + // ambiguity because of char*<->wxCStrData<->wxString conversions) + wxString s("foo"); + CPPUNIT_ASSERT( !dt.ParseFormat("foo") ); + CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) ); + CPPUNIT_ASSERT( !dt.ParseFormat(s) ); + CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str()) ); + + CPPUNIT_ASSERT( !dt.ParseFormat("foo", "%c") ); + CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), "%c") ); + CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") ); + CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), "%c") ); + + CPPUNIT_ASSERT( !dt.ParseFormat("foo", wxT("%c")) ); + CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), wxT("%c")) ); + CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") ); + CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), wxT("%c")) ); + + wxString spec("%c"); + CPPUNIT_ASSERT( !dt.ParseFormat("foo", spec) ); + CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), spec) ); + CPPUNIT_ASSERT( !dt.ParseFormat(s, spec) ); + CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), spec) ); } void DateTimeTestCase::TestTimeSpanFormat() @@ -690,22 +722,22 @@ void DateTimeTestCase::TestTimeSpanFormat() static const struct TimeSpanFormatTestData { long h, min, sec, msec; - const wxChar *fmt; - const wxChar *result; + const char *fmt; + const char *result; } testSpans[] = { - { 12, 34, 56, 789, _T("%H:%M:%S.%l"), _T("12:34:56.789") }, - { 1, 2, 3, 0, _T("%H:%M:%S"), _T("01:02:03") }, - { 1, 2, 3, 0, _T("%S"), _T("3723") }, - { -1, -2, -3, 0, _T("%S"), _T("-3723") }, - { -1, -2, -3, 0, _T("%H:%M:%S"), _T("-01:02:03") }, - { 26, 0, 0, 0, _T("%H"), _T("26") }, - { 26, 0, 0, 0, _T("%D, %H"), _T("1, 02") }, - { -26, 0, 0, 0, _T("%H"), _T("-26") }, - { -26, 0, 0, 0, _T("%D, %H"), _T("-1, 02") }, - { 219, 0, 0, 0, _T("%H"), _T("219") }, - { 219, 0, 0, 0, _T("%D, %H"), _T("9, 03") }, - { 219, 0, 0, 0, _T("%E, %D, %H"), _T("1, 2, 03") }, + { 12, 34, 56, 789, "%H:%M:%S.%l", "12:34:56.789" }, + { 1, 2, 3, 0, "%H:%M:%S", "01:02:03" }, + { 1, 2, 3, 0, "%S", "3723" }, + { -1, -2, -3, 0, "%S", "-3723" }, + { -1, -2, -3, 0, "%H:%M:%S", "-01:02:03" }, + { 26, 0, 0, 0, "%H", "26" }, + { 26, 0, 0, 0, "%D, %H", "1, 02" }, + { -26, 0, 0, 0, "%H", "-26" }, + { -26, 0, 0, 0, "%D, %H", "-1, 02" }, + { 219, 0, 0, 0, "%H", "219" }, + { 219, 0, 0, 0, "%D, %H", "9, 03" }, + { 219, 0, 0, 0, "%E, %D, %H", "1, 2, 03" }, }; for ( size_t n = 0; n < WXSIZEOF(testSpans); n++ ) @@ -718,23 +750,31 @@ void DateTimeTestCase::TestTimeSpanFormat() void DateTimeTestCase::TestTimeTicks() { + static const wxDateTime::TimeZone TZ_LOCAL(wxDateTime::Local); + static const wxDateTime::TimeZone TZ_TEST(wxDateTime::NZST); + + // this offset is needed to make the test work in any time zone when we + // only have expected test results in UTC in testDates + static const long tzOffset = TZ_LOCAL.GetOffset() - TZ_TEST.GetOffset(); + for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) { const Date& d = testDates[n]; - if ( d.ticks == -1 ) + if ( d.gmticks == -1 ) continue; - wxDateTime dt = d.DT(); - //RN: Translate according to test's time zone - //2nd param is to ignore DST - it's already factored - //into Vadim's tests - dt.MakeTimezone(wxDateTime::WEST, true); - long ticks = (dt.GetValue() / 1000).ToLong(); - CPPUNIT_ASSERT( ticks == d.ticks ); - - dt = d.DT().FromTimezone(wxDateTime::GMT0); + wxDateTime dt = d.DT().MakeTimezone(TZ_TEST, true /* no DST */); + + // GetValue() returns internal UTC-based representation, we need to + // convert it to local TZ before comparing + time_t ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset(); + if ( dt.IsDST() ) + ticks += 3600; + CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks + tzOffset ); + + dt = d.DT().FromTimezone(wxDateTime::UTC); ticks = (dt.GetValue() / 1000).ToLong(); - CPPUNIT_ASSERT( ticks == d.gmticks ); + CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks ); } } @@ -743,41 +783,69 @@ void DateTimeTestCase::TestParceRFC822() { static const struct ParseTestData { - const wxChar *rfc822; + const char *rfc822; Date date; // NB: this should be in UTC bool good; } parseTestDates[] = { { - _T("Sat, 18 Dec 1999 00:46:40 +0100"), - { 17, wxDateTime::Dec, 1999, 23, 46, 40, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, + "Sat, 18 Dec 1999 00:46:40 +0100", + { 17, wxDateTime::Dec, 1999, 23, 46, 40 }, true }, { - _T("Wed, 1 Dec 1999 05:17:20 +0300"), - { 1, wxDateTime::Dec, 1999, 2, 17, 20, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, + "Wed, 1 Dec 1999 05:17:20 +0300", + { 1, wxDateTime::Dec, 1999, 2, 17, 20 }, true }, { - _T("Sun, 28 Aug 2005 03:31:30 +0200"), - { 28, wxDateTime::Aug, 2005, 1, 31, 30, 0.0, wxDateTime::Inv_WeekDay, 0, 0 }, + "Sun, 28 Aug 2005 03:31:30 +0200", + { 28, wxDateTime::Aug, 2005, 1, 31, 30 }, true }, + + { + "Sat, 18 Dec 1999 10:48:30 -0500", + { 18, wxDateTime::Dec, 1999, 15, 48, 30 }, + true + }, + + // seconds are optional according to the RFC + { + "Sun, 01 Jun 2008 16:30 +0200", + { 1, wxDateTime::Jun, 2008, 14, 30, 00 }, + true + }, + + // try some bogus ones too + { + "Sun, 01 Jun 2008 16:30: +0200", + { 0 }, + false + }, }; - for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) + for ( unsigned n = 0; n < WXSIZEOF(parseTestDates); n++ ) { + const char * const datestr = parseTestDates[n].rfc822; + wxDateTime dt; - if ( dt.ParseRfc822Date(parseTestDates[n].rfc822) ) + if ( dt.ParseRfc822Date(datestr) ) { - CPPUNIT_ASSERT( parseTestDates[n].good ); + WX_ASSERT_MESSAGE( + ("Erroneously parsed \"%s\"", datestr), + parseTestDates[n].good + ); wxDateTime dtReal = parseTestDates[n].date.DT().FromUTC(); CPPUNIT_ASSERT_EQUAL( dtReal, dt ); } else // failed to parse { - CPPUNIT_ASSERT( !parseTestDates[n].good ); + WX_ASSERT_MESSAGE( + ("Failed to parse \"%s\"", datestr), + !parseTestDates[n].good + ); } } } @@ -787,21 +855,21 @@ void DateTimeTestCase::TestDateParse() { static const struct ParseTestData { - const wxChar *str; + const char *str; Date date; // NB: this should be in UTC bool good; } parseTestDates[] = { - { _T("21 Mar 2006"), { 21, wxDateTime::Mar, 2006 }, true }, - { _T("29 Feb 1976"), { 29, wxDateTime::Feb, 1976 }, true }, - { _T("Feb 29 1976"), { 29, wxDateTime::Feb, 1976 }, true }, - { _T("31/03/06"), { 31, wxDateTime::Mar, 6 }, true }, - { _T("31/03/2006"), { 31, wxDateTime::Mar, 2006 }, true }, + { "21 Mar 2006", { 21, wxDateTime::Mar, 2006 }, true }, + { "29 Feb 1976", { 29, wxDateTime::Feb, 1976 }, true }, + { "Feb 29 1976", { 29, wxDateTime::Feb, 1976 }, true }, + { "31/03/06", { 31, wxDateTime::Mar, 6 }, true }, + { "31/03/2006", { 31, wxDateTime::Mar, 2006 }, true }, // some invalid ones too - { _T("29 Feb 2006") }, - { _T("31/04/06") }, - { _T("bloordyblop") }, + { "29 Feb 2006" }, + { "31/04/06" }, + { "bloordyblop" }, }; // special cases @@ -811,7 +879,6 @@ void DateTimeTestCase::TestDateParse() for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) { - wxDateTime dt; if ( dt.ParseDate(parseTestDates[n].str) ) { CPPUNIT_ASSERT( parseTestDates[n].good ); @@ -825,16 +892,90 @@ void DateTimeTestCase::TestDateParse() } } +void DateTimeTestCase::TestDateParseISO() +{ + static const struct + { + const char *str; + Date date; // NB: this should be in UTC + bool good; + } parseTestDates[] = + { + { "2006-03-21", { 21, wxDateTime::Mar, 2006 }, true }, + { "1976-02-29", { 29, wxDateTime::Feb, 1976 }, true }, + { "0006-03-31", { 31, wxDateTime::Mar, 6 }, true }, + + // some invalid ones too + { "2006:03:31" }, + { "31/04/06" }, + { "bloordyblop" }, + { "" }, + }; + + static const struct + { + const char *str; + wxDateTime::wxDateTime_t hour, min, sec; + bool good; + } parseTestTimes[] = + { + { "13:42:17", 13, 42, 17, true }, + { "02:17:01", 2, 17, 1, true }, + + // some invalid ones too + { "66:03:31" }, + { "31/04/06" }, + { "bloordyblop" }, + { "" }, + }; + + for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) + { + wxDateTime dt; + if ( dt.ParseISODate(parseTestDates[n].str) ) + { + CPPUNIT_ASSERT( parseTestDates[n].good ); + + CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt ); + + for ( size_t m = 0; m < WXSIZEOF(parseTestTimes); m++ ) + { + wxString dtCombined; + dtCombined << parseTestDates[n].str + << 'T' + << parseTestTimes[m].str; + + if ( dt.ParseISOCombined(dtCombined) ) + { + CPPUNIT_ASSERT( parseTestTimes[m].good ); + + CPPUNIT_ASSERT_EQUAL( parseTestTimes[m].hour, dt.GetHour()) ; + CPPUNIT_ASSERT_EQUAL( parseTestTimes[m].min, dt.GetMinute()) ; + CPPUNIT_ASSERT_EQUAL( parseTestTimes[m].sec, dt.GetSecond()) ; + } + else // failed to parse combined date/time + { + CPPUNIT_ASSERT( !parseTestTimes[m].good ); + } + } + } + else // failed to parse + { + CPPUNIT_ASSERT( !parseTestDates[n].good ); + } + } +} + void DateTimeTestCase::TestDateTimeParse() { static const struct ParseTestData { - const wxChar *str; + const char *str; Date date; // NB: this should be in UTC bool good; } parseTestDates[] = { - { _T("Thu 22 Nov 2007 07:40:00 PM"), + { "Thu 22 Nov 2007 07:40:00 PM", { 22, wxDateTime::Nov, 2007, 19, 40, 0}, true }, }; @@ -842,7 +983,6 @@ void DateTimeTestCase::TestDateTimeParse() wxDateTime dt; for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) { - wxDateTime dt; if ( dt.ParseDateTime(parseTestDates[n].str) ) { CPPUNIT_ASSERT( parseTestDates[n].good );