X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e994615409e36d441135e4fa0761cf0398a2aa..87ec27805e0af503a24a2deb1afc324b2e95e5e5:/tests/datetime/datetimetest.cpp diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index bc68b2f7cc..3e26e83549 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -20,9 +20,65 @@ #ifndef WX_PRECOMP #endif // WX_PRECOMP +#if wxUSE_DATETIME + #include "wx/datetime.h" -#include "wx/cppunit.h" +// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects +static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) +{ + ostr << dt.FormatISOCombined(' '); + + return ostr; +} + +// to test Today() meaningfully we must be able to change the system date which +// is not usually the case, but if we're under Win32 we can try it -- define +// the macro below to do it +//#define CHANGE_SYSTEM_DATE + +#ifndef __WINDOWS__ + #undef CHANGE_SYSTEM_DATE +#endif + +#ifdef CHANGE_SYSTEM_DATE + +class DateChanger +{ +public: + DateChanger(int year, int month, int day, int hour, int min, int sec) + { + SYSTEMTIME st; + st.wDay = day; + st.wMonth = month; + st.wYear = year; + st.wHour = hour; + st.wMinute = min; + st.wSecond = sec; + st.wMilliseconds = 0; + + ::GetSystemTime(&m_savedTime); + ::GetTimeZoneInformation(&m_tzi); + + m_changed = ::SetSystemTime(&st) != 0; + } + + ~DateChanger() + { + if ( m_changed ) + { + ::SetSystemTime(&m_savedTime); + ::SetTimeZoneInformation(&m_tzi); + } + } + +private: + SYSTEMTIME m_savedTime; + TIME_ZONE_INFORMATION m_tzi; + bool m_changed; +}; + +#endif // CHANGE_SYSTEM_DATE // ---------------------------------------------------------------------------- // broken down date representation used for testing @@ -36,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) { @@ -47,7 +103,7 @@ struct Date min = tm.min; sec = tm.sec; jdn = 0.0; - gmticks = ticks = -1; + gmticks = -1; } wxDateTime DT() const @@ -88,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 }, }; @@ -128,9 +184,15 @@ private: CPPUNIT_TEST( TestTimeWDays ); CPPUNIT_TEST( TestTimeDST ); CPPUNIT_TEST( TestTimeFormat ); + CPPUNIT_TEST( TestTimeSpanFormat ); CPPUNIT_TEST( TestTimeTicks ); - CPPUNIT_TEST( TestTimeParse ); + CPPUNIT_TEST( TestParceRFC822 ); + CPPUNIT_TEST( TestDateParse ); + CPPUNIT_TEST( TestDateParseISO ); + CPPUNIT_TEST( TestDateTimeParse ); CPPUNIT_TEST( TestTimeArithmetics ); + CPPUNIT_TEST( TestDSTBug ); + CPPUNIT_TEST( TestDateOnly ); CPPUNIT_TEST_SUITE_END(); void TestLeapYears(); @@ -140,9 +202,15 @@ private: void TestTimeWDays(); void TestTimeDST(); void TestTimeFormat(); + void TestTimeSpanFormat(); void TestTimeTicks(); - void TestTimeParse(); + void TestParceRFC822(); + void TestDateParse(); + void TestDateParseISO(); + void TestDateTimeParse(); void TestTimeArithmetics(); + void TestDSTBug(); + void TestDateOnly(); DECLARE_NO_COPY_CLASS(DateTimeTestCase) }; @@ -209,7 +277,9 @@ void DateTimeTestCase::TestTimeJDN() { const Date& d = testDates[n]; wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec); - double jdn = dt.GetJulianDayNumber(); + + // JDNs must be computed for UTC times + double jdn = dt.FromUTC().GetJulianDayNumber(); CPPUNIT_ASSERT( jdn == d.jdn ); @@ -303,27 +373,26 @@ for n in range(20): static const WeekDateTestData weekDatesTestData[] = { - { { 20, wxDateTime::Mar, 2045 }, 3, wxDateTime::Mon, wxDateTime::Mar, 2045 }, - { { 5, wxDateTime::Jun, 1985 }, -4, wxDateTime::Wed, wxDateTime::Jun, 1985 }, - { { 12, wxDateTime::Nov, 1961 }, -3, wxDateTime::Sun, wxDateTime::Nov, 1961 }, - { { 27, wxDateTime::Feb, 2093 }, -1, wxDateTime::Fri, wxDateTime::Feb, 2093 }, - { { 4, wxDateTime::Jul, 2070 }, -4, wxDateTime::Fri, wxDateTime::Jul, 2070 }, - { { 2, wxDateTime::Apr, 1906 }, -5, wxDateTime::Mon, wxDateTime::Apr, 1906 }, - { { 19, wxDateTime::Jul, 2023 }, -2, wxDateTime::Wed, wxDateTime::Jul, 2023 }, - { { 5, wxDateTime::May, 1958 }, -4, wxDateTime::Mon, wxDateTime::May, 1958 }, - { { 11, wxDateTime::Aug, 1900 }, 2, wxDateTime::Sat, wxDateTime::Aug, 1900 }, - { { 14, wxDateTime::Feb, 1945 }, 2, wxDateTime::Wed, wxDateTime::Feb, 1945 }, - { { 25, wxDateTime::Jul, 1967 }, -1, wxDateTime::Tue, wxDateTime::Jul, 1967 }, - { { 9, wxDateTime::May, 1916 }, -4, wxDateTime::Tue, wxDateTime::May, 1916 }, - { { 20, wxDateTime::Jun, 1927 }, 3, wxDateTime::Mon, wxDateTime::Jun, 1927 }, - { { 2, wxDateTime::Aug, 2000 }, 1, wxDateTime::Wed, wxDateTime::Aug, 2000 }, - { { 20, wxDateTime::Apr, 2044 }, 3, wxDateTime::Wed, wxDateTime::Apr, 2044 }, - { { 20, wxDateTime::Feb, 1932 }, -2, wxDateTime::Sat, wxDateTime::Feb, 1932 }, - { { 25, wxDateTime::Jul, 2069 }, 4, wxDateTime::Thu, wxDateTime::Jul, 2069 }, - { { 3, wxDateTime::Apr, 1925 }, 1, wxDateTime::Fri, wxDateTime::Apr, 1925 }, - { { 21, wxDateTime::Mar, 2093 }, 3, wxDateTime::Sat, wxDateTime::Mar, 2093 }, - { { 3, wxDateTime::Dec, 2074 }, -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; @@ -406,28 +475,28 @@ for n in range(20): */ static const WeekNumberTestData weekNumberTestDates[] = { - { { 27, wxDateTime::Dec, 1966 }, 52, 5, 5, 361 }, - { { 22, wxDateTime::Jul, 1926 }, 29, 4, 4, 203 }, - { { 22, wxDateTime::Oct, 2076 }, 43, 4, 4, 296 }, - { { 1, wxDateTime::Jul, 1967 }, 26, 1, 1, 182 }, - { { 8, wxDateTime::Nov, 2004 }, 46, 2, 2, 313 }, - { { 21, wxDateTime::Mar, 1920 }, 12, 3, 4, 81 }, - { { 7, wxDateTime::Jan, 1965 }, 1, 2, 2, 7 }, - { { 19, wxDateTime::Oct, 1999 }, 42, 4, 4, 292 }, - { { 13, wxDateTime::Aug, 1955 }, 32, 2, 2, 225 }, - { { 18, wxDateTime::Jul, 2087 }, 29, 3, 3, 199 }, - { { 2, wxDateTime::Sep, 2028 }, 35, 1, 1, 246 }, - { { 28, wxDateTime::Jul, 1945 }, 30, 5, 4, 209 }, - { { 15, wxDateTime::Jun, 1901 }, 24, 3, 3, 166 }, - { { 10, wxDateTime::Oct, 1939 }, 41, 3, 2, 283 }, - { { 3, wxDateTime::Dec, 1965 }, 48, 1, 1, 337 }, - { { 23, wxDateTime::Feb, 1940 }, 8, 4, 4, 54 }, - { { 2, wxDateTime::Jan, 1987 }, 1, 1, 1, 2 }, - { { 11, wxDateTime::Aug, 2079 }, 32, 2, 2, 223 }, - { { 2, wxDateTime::Feb, 2063 }, 5, 1, 1, 33 }, - { { 16, wxDateTime::Oct, 1942 }, 42, 3, 3, 289 }, - { { 30, wxDateTime::Dec, 2003 }, 1, 5, 5, 364 }, - { { 2, wxDateTime::Jan, 2004 }, 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++ ) @@ -468,38 +537,38 @@ void DateTimeTestCase::TestTimeDST() static const Date datesDST[2][2004 - 1900 + 1] = { { - { 1, wxDateTime::Apr, 1990 }, - { 7, wxDateTime::Apr, 1991 }, - { 5, wxDateTime::Apr, 1992 }, - { 4, wxDateTime::Apr, 1993 }, - { 3, wxDateTime::Apr, 1994 }, - { 2, wxDateTime::Apr, 1995 }, - { 7, wxDateTime::Apr, 1996 }, - { 6, wxDateTime::Apr, 1997 }, - { 5, wxDateTime::Apr, 1998 }, - { 4, wxDateTime::Apr, 1999 }, - { 2, wxDateTime::Apr, 2000 }, - { 1, wxDateTime::Apr, 2001 }, - { 7, wxDateTime::Apr, 2002 }, - { 6, wxDateTime::Apr, 2003 }, - { 4, wxDateTime::Apr, 2004 }, + { 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 }, - { 27, wxDateTime::Oct, 1991 }, - { 25, wxDateTime::Oct, 1992 }, - { 31, wxDateTime::Oct, 1993 }, - { 30, wxDateTime::Oct, 1994 }, - { 29, wxDateTime::Oct, 1995 }, - { 27, wxDateTime::Oct, 1996 }, - { 26, wxDateTime::Oct, 1997 }, - { 25, wxDateTime::Oct, 1998 }, - { 31, wxDateTime::Oct, 1999 }, - { 29, wxDateTime::Oct, 2000 }, - { 28, wxDateTime::Oct, 2001 }, - { 27, wxDateTime::Oct, 2002 }, - { 26, wxDateTime::Oct, 2003 }, - { 31, wxDateTime::Oct, 2004 }, + { 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 }, } }; @@ -526,6 +595,7 @@ void DateTimeTestCase::TestTimeFormat() { CompareNone, // don't try comparing CompareBoth, // dates and times should be identical + CompareYear, // don't compare centuries (fails for 2 digit years) CompareDate, // dates only CompareTime // time only }; @@ -533,43 +603,46 @@ void DateTimeTestCase::TestTimeFormat() static const struct { CompareKind compareKind; - const wxChar *format; + const char *format; } formatTestFormats[] = { - { CompareBoth, _T("---> %c") }, - { CompareDate, _T("Date is %A, %d of %B, in year %Y") }, - { CompareBoth, _T("Date is %x, time is %X") }, - { 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[] = { - { 29, wxDateTime::May, 1976, 18, 30, 00 }, - { 31, wxDateTime::Dec, 1999, 23, 30, 00 }, + { 29, wxDateTime::May, 1976, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 31, wxDateTime::Dec, 1999, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 6, wxDateTime::Feb, 1937, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay }, + { 29, wxDateTime::Feb, 2400, 02, 15, 25, 0.0, wxDateTime::Inv_WeekDay }, #if 0 - // this test can't work for other centuries because it uses two digit - // years in formats, so don't even try it - { 29, wxDateTime::May, 2076, 18, 30, 00 }, - { 29, wxDateTime::Feb, 2400, 02, 15, 25 }, - { 01, wxDateTime::Jan, -52, 03, 16, 47 }, + // Need to add support for BCE dates. + { 01, wxDateTime::Jan, -52, 03, 16, 47, 0.0, wxDateTime::Inv_WeekDay }, #endif }; - for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ ) + for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ ) { - wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT(); + wxDateTime dt = formatTestDates[d].DT(); for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ ) { - wxString s = dt.Format(formatTestFormats[n].format); + const char *fmt = formatTestFormats[n].format; + wxString s = dt.Format(fmt); // what can we recover? - int kind = formatTestFormats[n].compareKind; + CompareKind kind = formatTestFormats[n].compareKind; // convert back wxDateTime dt2; - const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format); + const char *result = dt2.ParseFormat(s, fmt); if ( !result ) { // converion failed - should it have? @@ -582,8 +655,18 @@ void DateTimeTestCase::TestTimeFormat() switch ( kind ) { + case CompareYear: + if ( dt2.GetCentury() != dt.GetCentury() ) + { + CPPUNIT_ASSERT_EQUAL(dt.GetYear() % 100, + dt2.GetYear() % 100); + + dt2.SetYear(dt.GetYear()); + } + // fall through and compare everything + case CompareBoth: - CPPUNIT_ASSERT( dt2 == dt ); + CPPUNIT_ASSERT_EQUAL( dt, dt2 ); break; case CompareDate: @@ -593,55 +676,314 @@ void DateTimeTestCase::TestTimeFormat() case CompareTime: CPPUNIT_ASSERT( dt.IsSameTime(dt2) ); break; + + case CompareNone: + wxFAIL_MSG( _T("unexpected") ); + break; } } } } + + // test compilation of some calls which should compile (and not result in + // ambiguity because of char*<->wxCStrData<->wxString conversions) + wxDateTime dt; + 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() +{ + static const struct TimeSpanFormatTestData + { + long h, min, sec, msec; + const char *fmt; + const char *result; + } testSpans[] = + { + { 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++ ) + { + const TimeSpanFormatTestData& td = testSpans[n]; + wxTimeSpan ts(td.h, td.min, td.sec, td.msec); + CPPUNIT_ASSERT_EQUAL( wxString(td.result), ts.Format(td.fmt) ); + } } 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(); - long ticks = (dt.GetValue() / 1000).ToLong(); - CPPUNIT_ASSERT( ticks == d.ticks ); + wxDateTime dt = d.DT().MakeTimezone(TZ_TEST, true /* no DST */); - dt = d.DT().ToTimezone(wxDateTime::GMT0); + // GetValue() returns internal UTC-based representation, we need to + // convert it to local TZ before comparing + long ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset(); + if ( dt.IsDST() ) + ticks += 3600; + WX_ASSERT_TIME_T_EQUAL( d.gmticks, ticks + tzOffset ); + + dt = d.DT().FromTimezone(wxDateTime::UTC); ticks = (dt.GetValue() / 1000).ToLong(); - CPPUNIT_ASSERT( ticks == d.gmticks ); + WX_ASSERT_TIME_T_EQUAL( d.gmticks, ticks ); + } +} + +// test parsing dates in RFC822 format +void DateTimeTestCase::TestParceRFC822() +{ + static const struct ParseTestData + { + const char *rfc822; + Date date; // NB: this should be in UTC + bool good; + } parseTestDates[] = + { + { + "Sat, 18 Dec 1999 00:46:40 +0100", + { 17, wxDateTime::Dec, 1999, 23, 46, 40 }, + true + }, + { + "Wed, 1 Dec 1999 05:17:20 +0300", + { 1, wxDateTime::Dec, 1999, 2, 17, 20 }, + true + }, + { + "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 ( unsigned n = 0; n < WXSIZEOF(parseTestDates); n++ ) + { + const char * const datestr = parseTestDates[n].rfc822; + + wxDateTime dt; + if ( dt.ParseRfc822Date(datestr) ) + { + 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 + { + WX_ASSERT_MESSAGE( + ("Failed to parse \"%s\"", datestr), + !parseTestDates[n].good + ); + } } } -// test text -> wxDateTime conversion -void DateTimeTestCase::TestTimeParse() +// test parsing dates in free format +void DateTimeTestCase::TestDateParse() { static const struct ParseTestData { - const wxChar *format; - Date date; + const char *str; + Date date; // NB: this should be in UTC bool good; } parseTestDates[] = { - { _T("Sat, 18 Dec 1999 00:46:40 +0100"), { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, true }, - { _T("Wed, 1 Dec 1999 05:17:20 +0300"), { 1, wxDateTime::Dec, 1999, 03, 17, 20 }, 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 + { "29 Feb 2006" }, + { "31/04/06" }, + { "bloordyblop" }, }; + // special cases + wxDateTime dt; + CPPUNIT_ASSERT( dt.ParseDate(_T("today")) ); + CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), dt ); + for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) { - const wxChar *format = parseTestDates[n].format; + wxDateTime dt; + if ( dt.ParseDate(parseTestDates[n].str) ) + { + CPPUNIT_ASSERT( parseTestDates[n].good ); + + CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt ); + } + else // failed to parse + { + CPPUNIT_ASSERT( !parseTestDates[n].good ); + } + } +} +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.ParseRfc822Date(format) ) + if ( dt.ParseISODate(parseTestDates[n].str) ) { CPPUNIT_ASSERT( parseTestDates[n].good ); - wxDateTime dtReal = parseTestDates[n].date.DT(); - CPPUNIT_ASSERT( dt == dtReal ); + 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 char *str; + Date date; // NB: this should be in UTC + bool good; + } parseTestDates[] = + { + { "Thu 22 Nov 2007 07:40:00 PM", + { 22, wxDateTime::Nov, 2007, 19, 40, 0}, true }, + }; + + // special cases + wxDateTime dt; + for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) + { + wxDateTime dt; + if ( dt.ParseDateTime(parseTestDates[n].str) ) + { + CPPUNIT_ASSERT( parseTestDates[n].good ); + + CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt ); } else // failed to parse { @@ -677,3 +1019,92 @@ void DateTimeTestCase::TestTimeArithmetics() } } +void DateTimeTestCase::TestDSTBug() +{ + ///////////////////////// + // Test GetEndDST() + wxDateTime dt = wxDateTime::GetEndDST(2004, wxDateTime::France); + CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay()); + CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth()); + CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear()); + CPPUNIT_ASSERT_EQUAL(1, (int)dt.GetHour()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond()); + + ///////////////////////// + // Test ResetTime() + dt.SetHour(5); + CPPUNIT_ASSERT_EQUAL(5, (int)dt.GetHour()); + dt.ResetTime(); + CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay()); + CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth()); + CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetHour()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond()); + + dt.Set(1, 0, 0, 0); + CPPUNIT_ASSERT_EQUAL(1, (int)dt.GetHour()); + + ///////////////////////// + // Test Today() +#ifdef CHANGE_SYSTEM_DATE + { + DateChanger change(2004, 10, 31, 5, 0, 0); + dt = wxDateTime::Today(); + } + + CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay()); + CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth()); + CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetHour()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond()); + + ///////////////////////// + // Test Set(hour, minute, second, milli) + wxDateTime dt2; + { + DateChanger change(2004, 10, 31, 5, 0, 0); + dt.Set(1, 30, 0, 0); + dt2.Set(5, 30, 0, 0); + } + + CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay()); + CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth()); + CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear()); + CPPUNIT_ASSERT_EQUAL(1, (int)dt.GetHour()); + CPPUNIT_ASSERT_EQUAL(30, (int)dt.GetMinute()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond()); + + CPPUNIT_ASSERT_EQUAL(31, (int)dt2.GetDay()); + CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt2.GetMonth()); + CPPUNIT_ASSERT_EQUAL(2004, (int)dt2.GetYear()); + CPPUNIT_ASSERT_EQUAL(5, (int)dt2.GetHour()); + CPPUNIT_ASSERT_EQUAL(30, (int)dt2.GetMinute()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetSecond()); + CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetMillisecond()); +#endif // CHANGE_SYSTEM_DATE +} + +void DateTimeTestCase::TestDateOnly() +{ + wxDateTime dt(19, wxDateTime::Jan, 2007, 15, 01, 00); + + static const wxDateTime::wxDateTime_t DATE_ZERO = 0; + CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetHour() ); + CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetMinute() ); + CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetSecond() ); + CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetMillisecond() ); + + dt.ResetTime(); + CPPUNIT_ASSERT_EQUAL( wxDateTime(19, wxDateTime::Jan, 2007), dt ); + + CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), wxDateTime::Now().GetDateOnly() ); +} + +#endif // wxUSE_DATETIME