// headers
// ----------------------------------------------------------------------------
-#include "wx/wxprec.h"
+#include "testprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#ifndef WX_PRECOMP
#endif // WX_PRECOMP
+#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)
+{
+ ostr << dt.Format();
+
+ return ostr;
+}
-#include "wx/cppunit.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
+// 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
double jdn;
wxDateTime::WeekDay wday;
time_t gmticks, ticks;
-
+ long flags; //Test specific flags - currently only used by TestTimeFormat.
+
void Init(const wxDateTime::Tm& tm)
{
day = tm.mday;
year > 0 ? _T("AD") : _T("BC"));
return s;
}
+ bool IsSet(long f) const { return (f && flags) ==f; }
};
// ----------------------------------------------------------------------------
CPPUNIT_TEST( TestTimeDST );
CPPUNIT_TEST( TestTimeFormat );
CPPUNIT_TEST( TestTimeTicks );
- CPPUNIT_TEST( TestTimeParse );
+ CPPUNIT_TEST( TestParceRFC822 );
+ CPPUNIT_TEST( TestDateParse );
CPPUNIT_TEST( TestTimeArithmetics );
+ CPPUNIT_TEST( TestDSTBug );
CPPUNIT_TEST_SUITE_END();
void TestLeapYears();
void TestTimeDST();
void TestTimeFormat();
void TestTimeTicks();
- void TestTimeParse();
+ void TestParceRFC822();
+ void TestDateParse();
void TestTimeArithmetics();
+ void TestDSTBug();
DECLARE_NO_COPY_CLASS(DateTimeTestCase)
};
{
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 );
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, 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 }
};
wxDateTime dt;
*/
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, 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 },
};
for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
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, 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 },
},
{
- { 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, 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 },
}
};
CompareTime // time only
};
+ const int WORKS_WITH_2DIGIT_YEAR(1);
static const struct
{
CompareKind compareKind;
+ long flagsneeded;
const wxChar *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") },
+ { CompareBoth,0 , _T("---> %c") }, //Assumes %c show a 4digit year.
+ { CompareDate,0, _T("Date is %A, %d of %B, in year %Y") },
+ { CompareBoth,WORKS_WITH_2DIGIT_YEAR, _T("Date is %x, time is %X") },
+ { CompareTime,0, _T("Time is %H:%M:%S or %I:%M:%S %p") },
+ { CompareNone,0, _T("The day of year: %j, the week of year: %W") },
+ { CompareDate,0, _T("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, 0, 0 , WORKS_WITH_2DIGIT_YEAR},
+ { 31, wxDateTime::Dec, 1999, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 , WORKS_WITH_2DIGIT_YEAR },
+ { 6, wxDateTime::Feb, 1937, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 29, wxDateTime::Feb, 2400, 02, 15, 25, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
#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, 0, 0 ,0 },
#endif
};
wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT();
for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
{
+ //Skip test if date hasn't got the required flags.
+ if ((d!=0) && !(formatTestDates[d - 1].IsSet(formatTestFormats[n].flagsneeded))) continue;
+
wxString s = dt.Format(formatTestFormats[n].format);
-
// what can we recover?
int kind = formatTestFormats[n].compareKind;
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().ToTimezone(wxDateTime::GMT0);
+ dt = d.DT().FromTimezone(wxDateTime::GMT0);
ticks = (dt.GetValue() / 1000).ToLong();
CPPUNIT_ASSERT( ticks == d.gmticks );
}
}
-// test text -> wxDateTime conversion
-void DateTimeTestCase::TestTimeParse()
+// test parsing dates in RFC822 format
+void DateTimeTestCase::TestParceRFC822()
{
static const struct ParseTestData
{
- const wxChar *format;
- Date date;
+ const wxChar *rfc822;
+ 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 },
+ {
+ _T("Sat, 18 Dec 1999 00:46:40 +0100"),
+ { 17, wxDateTime::Dec, 1999, 23, 46, 40, 0.0, wxDateTime::Inv_WeekDay, 0, 0 },
+ true
+ },
+ {
+ _T("Wed, 1 Dec 1999 05:17:20 +0300"),
+ { 1, wxDateTime::Dec, 1999, 2, 17, 20, 0.0, wxDateTime::Inv_WeekDay, 0, 0 },
+ true
+ },
+ {
+ _T("Sun, 28 Aug 2005 03:31:30 +0200"),
+ { 28, wxDateTime::Aug, 2005, 1, 31, 30, 0.0, wxDateTime::Inv_WeekDay, 0, 0 },
+ true
+ },
};
for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
{
- const wxChar *format = parseTestDates[n].format;
+ wxDateTime dt;
+ if ( dt.ParseRfc822Date(parseTestDates[n].rfc822) )
+ {
+ CPPUNIT_ASSERT( parseTestDates[n].good );
+
+ wxDateTime dtReal = parseTestDates[n].date.DT().FromUTC();
+ CPPUNIT_ASSERT_EQUAL( dtReal, dt );
+ }
+ else // failed to parse
+ {
+ CPPUNIT_ASSERT( !parseTestDates[n].good );
+ }
+ }
+}
+
+// test parsing dates in free format
+void DateTimeTestCase::TestDateParse()
+{
+ static const struct ParseTestData
+ {
+ const wxChar *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 },
+
+ // some invalid ones too
+ { _T("29 Feb 2006") },
+ { _T("31/04/06") },
+ { _T("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++ )
+ {
wxDateTime dt;
- if ( dt.ParseRfc822Date(format) )
+ if ( dt.ParseDate(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 );
}
else // failed to parse
{
}
}
+void DateTimeTestCase::TestDSTBug()
+{
+ /////////////////////////
+ // Test GetEndDST()
+ wxDateTime dt = wxDateTime::GetEndDST(2004);
+ 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(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
+}
+
+#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff