#pragma hdrstop
#endif
+#if wxUSE_DATETIME
+
#ifndef WX_PRECOMP
+ #include "wx/time.h" // wxGetTimeZone()
#endif // WX_PRECOMP
-#if wxUSE_DATETIME
-
-#include "wx/datetime.h"
#include "wx/wxcrt.h" // for wxStrstr()
-// 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;
-}
-
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t)
+#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 class setting the locale to "C" for its lifetime
-class CLocaleSetter
-{
-public:
- CLocaleSetter() : m_locOld(setlocale(LC_ALL, "C")) { }
- ~CLocaleSetter() { setlocale(LC_ALL, m_locOld); }
-
-private:
- const char * const m_locOld;
- wxDECLARE_NO_COPY_CLASS(CLocaleSetter);
-};
-
// helper function translating week day/month names from English to the current
// locale
static wxString TranslateDate(const wxString& str)
CPPUNIT_TEST( TestTimeWDays );
CPPUNIT_TEST( TestTimeDST );
CPPUNIT_TEST( TestTimeFormat );
+ CPPUNIT_TEST( TestTimeParse );
CPPUNIT_TEST( TestTimeSpanFormat );
CPPUNIT_TEST( TestTimeTicks );
CPPUNIT_TEST( TestParceRFC822 );
void TestTimeWDays();
void TestTimeDST();
void TestTimeFormat();
+ void TestTimeParse();
void TestTimeSpanFormat();
void TestTimeTicks();
void TestParceRFC822();
// 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" );
// ============================================================================
{ { 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 },
+ { { 31, wxDateTime::Dec, 2009, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 53, 5, 5, 365 },
+ { { 31, wxDateTime::Dec, 2012, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 6, 6, 366 },
+ { { 29, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 52, 5, 5, 363 },
+ { { 30, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 6, 5, 364 },
+ { { 31, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 1, 6, 5, 365 },
};
for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
{ 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[] =
#endif
};
- for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
+ for ( unsigned idxtz = 0; idxtz < WXSIZEOF(timeZonesOffsets); ++idxtz )
{
- wxDateTime dt = formatTestDates[d].DT();
- for ( unsigned n = 0; n < WXSIZEOF(formatTestFormats); n++ )
- {
- 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;
+ wxDateTime::TimeZone tz(timeZonesOffsets[idxtz]);
+ const bool isLocalTz = tz.GetOffset() == -wxGetTimeZone();
- wxString s = dt.Format(fmt);
+ for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
+ {
+ wxDateTime dt = formatTestDates[d].DT();
+ for ( unsigned n = 0; n < WXSIZEOF(formatTestFormats); n++ )
+ {
+ 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;
+ }
- // what can we recover?
- CompareKind kind = formatTestFormats[n].compareKind;
+ // do convert date to string
+ wxString s = dt.Format(fmt, tz);
- // convert back
- wxDateTime dt2;
- const char *result = dt2.ParseFormat(s, fmt);
- if ( !result )
- {
- // conversion failed - should it have?
- WX_ASSERT_MESSAGE(
- ("Test #%lu failed: failed to parse \"%s\"", n, s),
- kind == CompareNone
- );
- }
- else // conversion succeeded
- {
- // 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 #%lu failed: \"%s\" was left unparsed in \"%s\"",
- n, result, s),
- !*result
- );
-
- 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( wxT("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;
+ }
}
}
}
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) );
- CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str()) );
+ 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") );
- CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), "%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") );
- CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), wxT("%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) );
- CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), spec) );
+ dt.ParseFormat(s.c_str(), spec);
+}
+
+// Test parsing time in free format.
+void DateTimeTestCase::TestTimeParse()
+{
+ wxDateTime dt;
+
+ // Parsing standard formats should work.
+ CPPUNIT_ASSERT( dt.ParseTime("12:34:56") );
+ CPPUNIT_ASSERT_EQUAL( "12:34:56", dt.FormatISOTime() );
+
+ // Parsing just hours should work too.
+ dt.ResetTime();
+ CPPUNIT_ASSERT( dt.ParseTime("17") );
+ CPPUNIT_ASSERT_EQUAL( "17:00:00", dt.FormatISOTime() );
+
+ // Parsing gibberish shouldn't work.
+ CPPUNIT_ASSERT( !dt.ParseTime("bloordyblop") );
}
void DateTimeTestCase::TestTimeSpanFormat()
{ "29 Feb 2006" },
{ "31/04/06" },
{ "bloordyblop" },
+ { "2 . . " },
};
// special cases
);
}
}
+
+ // 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()
bool good;
} parseTestDates[] =
{
- { "Thu 22 Nov 2007 07:40:00 PM",
- { 22, wxDateTime::Nov, 2007, 19, 40, 0}, true },
+ {
+ "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
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()
projects / wxWidgets.git / blobdiff