#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
#if wxUSE_DATETIME
-#include "wx/datetime.h"
-#include "wx/ioswrap.h"
+#ifndef WX_PRECOMP
+ #include "wx/time.h" // wxGetTimeZone()
+#endif // WX_PRECOMP
-// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects
-static wxSTD ostream& operator<<(wxSTD ostream& ostr, const wxDateTime& dt)
-{
- ostr << dt.FormatISODate() << _T(" ") << dt.FormatISOTime();
+#include "wx/wxcrt.h" // for wxStrstr()
- return ostr;
-}
+#include "testdate.h"
// 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
#endif // CHANGE_SYSTEM_DATE
+// helper function translating week day/month names from English to the current
+// locale
+static wxString TranslateDate(const wxString& str)
+{
+ // small optimization: if there are no alphabetic characters in the string,
+ // there is nothing to translate
+ wxString::const_iterator i, end = str.end();
+ for ( i = str.begin(); i != end; ++i )
+ {
+ if ( isalpha(*i) )
+ break;
+ }
+
+ if ( i == end )
+ return str;
+
+ wxString trans(str);
+
+ for ( wxDateTime::WeekDay wd = wxDateTime::Sun;
+ wd < wxDateTime::Inv_WeekDay;
+ wxNextWDay(wd) )
+ {
+ trans.Replace
+ (
+ wxDateTime::GetEnglishWeekDayName(wd, wxDateTime::Name_Abbr),
+ wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr)
+ );
+ }
+
+ for ( wxDateTime::Month mon = wxDateTime::Jan;
+ mon < wxDateTime::Inv_Month;
+ wxNextMonth(mon) )
+ {
+ trans.Replace
+ (
+ wxDateTime::GetEnglishMonthName(mon, wxDateTime::Name_Abbr),
+ wxDateTime::GetMonthName(mon, wxDateTime::Name_Abbr)
+ );
+ }
+
+ return trans;
+}
+
// ----------------------------------------------------------------------------
// broken down date representation used for testing
// ----------------------------------------------------------------------------
wxDateTime::wxDateTime_t hour, min, sec;
double jdn;
wxDateTime::WeekDay wday;
- time_t gmticks, ticks;
+ time_t gmticks;
void Init(const wxDateTime::Tm& tm)
{
min = tm.min;
sec = tm.sec;
jdn = 0.0;
- gmticks = ticks = -1;
+ gmticks = -1;
}
wxDateTime DT() const
wxString Format() const
{
wxString s;
- s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"),
+ s.Printf(wxT("%02d:%02d:%02d %10s %02d, %4d%s"),
hour, min, sec,
wxDateTime::GetMonthName(month).c_str(),
day,
abs(wxDateTime::ConvertYearToBC(year)),
- year > 0 ? _T("AD") : _T("BC"));
+ year > 0 ? wxT("AD") : wxT("BC"));
return s;
}
wxString FormatDate() const
{
wxString s;
- s.Printf(_T("%02d-%s-%4d%s"),
+ s.Printf(wxT("%02d-%s-%4d%s"),
day,
wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
abs(wxDateTime::ConvertYearToBC(year)),
- year > 0 ? _T("AD") : _T("BC"));
+ year > 0 ? wxT("AD") : wxT("BC"));
return s;
}
};
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 },
};
CPPUNIT_TEST( TestTimeTicks );
CPPUNIT_TEST( TestParceRFC822 );
CPPUNIT_TEST( TestDateParse );
+ CPPUNIT_TEST( TestDateParseISO );
+ CPPUNIT_TEST( TestDateTimeParse );
CPPUNIT_TEST( TestTimeArithmetics );
CPPUNIT_TEST( TestDSTBug );
CPPUNIT_TEST( TestDateOnly );
void TestTimeTicks();
void TestParceRFC822();
void TestDateParse();
+ void TestDateParseISO();
+ void TestDateTimeParse();
void TestTimeArithmetics();
void TestDSTBug();
void TestDateOnly();
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( DateTimeTestCase );
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DateTimeTestCase, "DateTimeTestCase" );
// ============================================================================
{
const LeapYearTestData& y = years[n];
- CPPUNIT_ASSERT( wxDateTime::IsLeapYear(y.year) == y.isLeap );
+ CPPUNIT_ASSERT_EQUAL( y.isLeap, wxDateTime::IsLeapYear(y.year) );
}
}
wxString s1 = d1.Format(),
s2 = d2.Format();
- CPPUNIT_ASSERT( s1 == s2 );
+ CPPUNIT_ASSERT_EQUAL( s1, s2 );
}
}
// 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() );
}
}
wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
wxDateTime::WeekDay wday = dt.GetWeekDay();
- CPPUNIT_ASSERT( wday == d.wday );
+ CPPUNIT_ASSERT_EQUAL( d.wday, wday );
}
// test SetToWeekDay()
wxString s, which;
switch ( nWeek < -1 ? -nWeek : nWeek )
{
- case 1: which = _T("first"); break;
- case 2: which = _T("second"); break;
- case 3: which = _T("third"); break;
- case 4: which = _T("fourth"); break;
- case 5: which = _T("fifth"); break;
+ case 1: which = wxT("first"); break;
+ case 2: which = wxT("second"); break;
+ case 3: which = wxT("third"); break;
+ case 4: which = wxT("fourth"); break;
+ case 5: which = wxT("fifth"); break;
- case -1: which = _T("last"); break;
+ case -1: which = wxT("last"); break;
}
if ( nWeek < -1 )
{
- which += _T(" from end");
+ which += wxT(" from end");
}
- s.Printf(_T("The %s %s of %s in %d"),
+ s.Printf(wxT("The %s %s of %s in %d"),
which.c_str(),
wxDateTime::GetWeekDayName(wday).c_str(),
wxDateTime::GetMonthName(month).c_str(),
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;
*/
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 },
+ { { 5, wxDateTime::Jan, 2010, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 2, 2, 5 },
+ { { 3, wxDateTime::Jan, 2011, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 2, 2, 3 },
};
for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
dnum = dt.GetDayOfYear();
- CPPUNIT_ASSERT( dnum == wn.dnum );
- CPPUNIT_ASSERT( wmon == wn.wmon );
- CPPUNIT_ASSERT( wmon2 == wn.wmon2 );
- CPPUNIT_ASSERT( week == wn.week );
+ WX_ASSERT_EQUAL_MESSAGE( ("day of year for %s", d.Format()),
+ wn.dnum, dnum );
+ WX_ASSERT_EQUAL_MESSAGE( ("week of month (Monday) for %s", d.Format()),
+ wn.wmon, wmon );
+ WX_ASSERT_EQUAL_MESSAGE( ("week of month (Sunday) for %s", d.Format()),
+ wn.wmon2, wmon2 );
+ WX_ASSERT_EQUAL_MESSAGE( ("week of year for %s", d.Format()),
+ wn.week, week );
int year = d.year;
if ( week == 1 && d.month != wxDateTime::Jan )
wxDateTime
dt2 = wxDateTime::SetToWeekOfYear(year, week, dt.GetWeekDay());
- CPPUNIT_ASSERT( dt2 == dt );
+ CPPUNIT_ASSERT_EQUAL( dt, dt2 );
}
}
void DateTimeTestCase::TestTimeDST()
{
// taken from http://www.energy.ca.gov/daylightsaving.html
- static const Date datesDST[2][2004 - 1900 + 1] =
+ static const Date datesDST[2][2009 - 1990 + 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 },
+ { 3, wxDateTime::Apr, 2005, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 2, wxDateTime::Apr, 2006, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ {11, wxDateTime::Mar, 2007, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 9, wxDateTime::Mar, 2008, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 8, wxDateTime::Mar, 2009, 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 },
+ { 30, wxDateTime::Oct, 2005, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 29, wxDateTime::Oct, 2006, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 4, wxDateTime::Nov, 2007, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 2, wxDateTime::Nov, 2008, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+ { 1, wxDateTime::Nov, 2009, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+
}
};
- for ( int year = 1990; year < 2005; year++ )
+ for ( size_t n = 0; n < WXSIZEOF(datesDST[0]); n++ )
{
+ const int year = 1990 + n;
wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
- size_t n = year - 1990;
const Date& dBegin = datesDST[0][n];
const Date& dEnd = datesDST[1][n];
- CPPUNIT_ASSERT( dBegin.SameDay(dtBegin.GetTm()) );
- CPPUNIT_ASSERT( dEnd.SameDay(dtEnd.GetTm()) );
+ CPPUNIT_ASSERT_EQUAL( dBegin.DT().FormatDate(), dtBegin.FormatDate() );
+ CPPUNIT_ASSERT_EQUAL( dEnd.DT().FormatDate(), dtEnd.FormatDate() );
}
}
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" },
+ { CompareBoth, "RFC 2822 string: %Y-%m-%d %H:%M:%S.%l %z" },
+
+ };
+
+ const long timeZonesOffsets[] =
+ {
+ wxDateTime::TimeZone(wxDateTime::Local).GetOffset(),
+
+ // Fictitious TimeZone offsets to ensure time zone formating and
+ // interpretation works
+ -(3600 + 2*60),
+ 3*3600 + 30*60
};
static const Date formatTestDates[] =
{ 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 },
+
+ // FIXME: the test with 02:15:25 time doesn't pass because of DST
+ // computation problems, we get back 03:15:25
+ { 29, wxDateTime::Feb, 2400, 04, 15, 25, 0.0, wxDateTime::Inv_WeekDay },
#if 0
// 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); d++ )
+ for ( unsigned idxtz = 0; idxtz < WXSIZEOF(timeZonesOffsets); ++idxtz )
{
- wxDateTime dt = formatTestDates[d].DT();
- for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
- {
- const wxChar *fmt = formatTestFormats[n].format;
- wxString s = dt.Format(fmt);
+ wxDateTime::TimeZone tz(timeZonesOffsets[idxtz]);
+ const bool isLocalTz = tz.GetOffset() == -wxGetTimeZone();
- // what can we recover?
- CompareKind kind = formatTestFormats[n].compareKind;
-
- // convert back
- wxDateTime dt2;
- const wxChar *result = dt2.ParseFormat(s.c_str(), fmt);
- if ( !result )
- {
- // converion failed - should it have?
- CPPUNIT_ASSERT( kind == CompareNone );
- }
- else // conversion succeeded
+ for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
+ {
+ wxDateTime dt = formatTestDates[d].DT();
+ for ( unsigned n = 0; n < WXSIZEOF(formatTestFormats); n++ )
{
- // should have parsed the entire string
- CPPUNIT_ASSERT( !*result );
+ const char *fmt = formatTestFormats[n].format;
+
+ // skip the check with %p for those locales which have empty AM/PM strings:
+ // for those locales it's impossible to pass the test with %p...
+ wxString am, pm;
+ wxDateTime::GetAmPmStrings(&am, &pm);
+ if (am.empty() && pm.empty() && wxStrstr(fmt, "%p") != NULL)
+ continue;
+
+ // what can we recover?
+ CompareKind kind = formatTestFormats[n].compareKind;
+
+ // When using a different time zone we must perform a time zone
+ // conversion below which doesn't always work correctly, check
+ // for the cases when it doesn't.
+ if ( !isLocalTz )
+ {
+ // DST computation doesn't work correctly for dates above
+ // 2038 currently on the systems with 32 bit time_t.
+ if ( dt.GetYear() >= 2038 )
+ continue;
+
+ // We can't compare just dates nor just times when doing TZ
+ // conversion as both are affected by the DST: for the
+ // dates, the DST can switch midnight to 23:00 of the
+ // previous day while for the times DST can be different
+ // for the original date and today.
+ if ( kind == CompareDate || kind == CompareTime )
+ continue;
+ }
+
+ // do convert date to string
+ wxString s = dt.Format(fmt, tz);
- switch ( kind )
+ // convert back
+ wxDateTime dt2;
+ const char *result = dt2.ParseFormat(s, fmt);
+ if ( !result )
+ {
+ // conversion failed - should it have?
+ WX_ASSERT_MESSAGE(
+ ("Test #%u failed: failed to parse \"%s\"", n, s),
+ kind == CompareNone
+ );
+ }
+ else // conversion succeeded
{
- 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_EQUAL( dt, dt2 );
- break;
-
- case CompareDate:
- CPPUNIT_ASSERT( dt.IsSameDate(dt2) );
- break;
-
- case CompareTime:
- CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
- break;
-
- case CompareNone:
- wxFAIL_MSG( _T("unexpected") );
- break;
+ // currently ParseFormat() doesn't support "%Z" and so is
+ // incapable of parsing time zone part used at the end of date
+ // representations in many (but not "C") locales, compensate
+ // for it ourselves by simply consuming and ignoring it
+ while ( *result && (*result >= 'A' && *result <= 'Z') )
+ result++;
+
+ WX_ASSERT_MESSAGE(
+ ("Test #%u failed: \"%s\" was left unparsed in \"%s\"",
+ n, result, s),
+ !*result
+ );
+
+ // Without "%z" we can't recover the time zone used in the
+ // call to Format() so we need to call MakeFromTimezone()
+ // explicitly.
+ if ( !strstr(fmt, "%z") && !isLocalTz )
+ dt2.MakeFromTimezone(tz);
+
+ 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_EQUAL( dt, dt2 );
+ break;
+
+ case CompareDate:
+ CPPUNIT_ASSERT( dt.IsSameDate(dt2) );
+ break;
+
+ case CompareTime:
+ CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
+ break;
+
+ case CompareNone:
+ wxFAIL_MSG( wxT("unexpected") );
+ break;
+ }
}
}
}
}
+
+ wxDateTime dt;
+
+#if 0
+ // special case which was known to fail
+ CPPUNIT_ASSERT( dt.ParseFormat("02/06/1856", "%x") );
+ CPPUNIT_ASSERT_EQUAL( 1856, dt.GetYear() );
+#endif
+
+ // also test %l separately
+ CPPUNIT_ASSERT( dt.ParseFormat("12:23:45.678", "%H:%M:%S.%l") );
+ CPPUNIT_ASSERT_EQUAL( 678, dt.GetMillisecond() );
+
+ // test special case of %l matching 0 milliseconds
+ CPPUNIT_ASSERT( dt.ParseFormat("12:23:45.000", "%H:%M:%S.%l") );
+ CPPUNIT_ASSERT_EQUAL( 0, dt.GetMillisecond() );
+
+ // test partially specified dates too
+ wxDateTime dtDef(26, wxDateTime::Sep, 2008);
+ CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") );
+ CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() );
+
+ // test some degenerate cases
+ CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") );
+ CPPUNIT_ASSERT( !dt.ParseFormat("", "%%") );
+
+ // 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) );
+ dt.ParseFormat(s.c_str()); // Simply test compilation of this one.
+
+ CPPUNIT_ASSERT( !dt.ParseFormat("foo", "%c") );
+ CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), "%c") );
+ CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );
+ 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") );
+ 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) );
+ dt.ParseFormat(s.c_str(), spec);
}
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" },
+ { 0, -1, 0, 0, "%H:%M:%S", "-00:01:00" },
+ { 0, 0, -1, 0, "%H:%M:%S", "-00:00:01" },
};
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) );
+ CPPUNIT_ASSERT_EQUAL( 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();
- //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 );
}
}
{
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
+ );
}
}
}
{
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" },
+ { "2 . . " },
};
// special cases
wxDateTime dt;
- CPPUNIT_ASSERT( dt.ParseDate(_T("today")) );
+ CPPUNIT_ASSERT( dt.ParseDate(wxT("today")) );
CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), dt );
+ for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
+ {
+ const wxString datestr = TranslateDate(parseTestDates[n].str);
+
+ const char * const end = dt.ParseDate(datestr);
+ if ( end && !*end )
+ {
+ WX_ASSERT_MESSAGE(
+ ("Erroneously parsed \"%s\"", datestr),
+ parseTestDates[n].good
+ );
+
+ CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
+ }
+ else // failed to parse
+ {
+ WX_ASSERT_MESSAGE(
+ ("Failed to parse \"%s\"", datestr),
+ !parseTestDates[n].good
+ );
+ }
+ }
+
+ // Check that incomplete parse works correctly.
+ const char* p = dt.ParseFormat("2012-03-23 12:34:56", "%Y-%m-%d");
+ CPPUNIT_ASSERT_EQUAL( " 12:34:56", wxString(p) );
+}
+
+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.ParseDate(parseTestDates[n].str) )
+ 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 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
+ },
+
+ {
+ "2010-01-04 14:30",
+ { 4, wxDateTime::Jan, 2010, 14, 30, 0 },
+ true
+ },
+
+ {
+ "bloordyblop",
+ { 1, wxDateTime::Jan, 9999, 0, 0, 0},
+ false
+ },
+
+ {
+ "2012-01-01 10:12:05 +0100",
+ { 1, wxDateTime::Jan, 2012, 10, 12, 5, -1 },
+ false // ParseDateTime does know yet +0100
+ },
+ };
+
+ // the test strings here use "PM" which is not available in all locales so
+ // we need to use "C" locale for them
+ CLocaleSetter cloc;
+
+ wxDateTime dt;
+ for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
+ {
+ const wxString datestr = TranslateDate(parseTestDates[n].str);
+
+ const char * const end = dt.ParseDateTime(datestr);
+ if ( end && !*end )
+ {
+ WX_ASSERT_MESSAGE(
+ ("Erroneously parsed \"%s\"", datestr),
+ parseTestDates[n].good
+ );
+
+ CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
}
else // failed to parse
{
+ WX_ASSERT_MESSAGE(
+ ("Failed to parse \"%s\"", datestr),
+ !parseTestDates[n].good
+ );
+
CPPUNIT_ASSERT( !parseTestDates[n].good );
}
}
dt1 = dt + span;
dt2 = dt - span;
- CPPUNIT_ASSERT( dt1 - span == dt );
- CPPUNIT_ASSERT( dt2 + span == dt );
- CPPUNIT_ASSERT( dt2 + 2*span == dt1 );
+ CPPUNIT_ASSERT_EQUAL( dt, dt1 - span );
+ CPPUNIT_ASSERT_EQUAL( dt, dt2 + span );
+ CPPUNIT_ASSERT_EQUAL( dt1, dt2 + 2*span );
+ CPPUNIT_ASSERT_EQUAL( span, dt1.DiffAsDateSpan(dt) );
}
+
+ // More date span arithmetics tests
+ wxDateTime dtd1(5, wxDateTime::Jun, 1998);
+ wxDateTime dtd2(6, wxDateTime::Aug, 1999);
+
+ // All parts in dtd2 is after dtd1
+ CPPUNIT_ASSERT_EQUAL( wxDateSpan(1, 2, 0, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+ // Year and month after, day earlier, so no full month
+ // Jul has 31 days, so it's 31 - 5 + 4 = 30, or 4w 2d
+ dtd2.Set(4, wxDateTime::Aug, 1999);
+ CPPUNIT_ASSERT_EQUAL( wxDateSpan(1, 1, 4, 2), dtd2.DiffAsDateSpan(dtd1) );
+
+ // Year and day after, month earlier, so no full year, but same day diff as
+ // first example
+ dtd2.Set(6, wxDateTime::May, 1999);
+ CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, 11, 0, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+ // Year after, month and day earlier, so no full month and no full year
+ // April has 30 days, so it's 30 - 5 + 4 = 29, or 4w 1d
+ dtd2.Set(4, wxDateTime::May, 1999);
+ CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, 10, 4, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+ // And a reverse. Now we should use days in Jun (again 30 => 4w 1d)
+ CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, -10, -4, -1), dtd1.DiffAsDateSpan(dtd2) );
}
void DateTimeTestCase::TestDSTBug()
{
/////////////////////////
// Test GetEndDST()
- wxDateTime dt = wxDateTime::GetEndDST(2004);
+ 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(2, (int)dt.GetHour());
+ 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());
projects / wxWidgets.git / blobdiff