Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-09 18:13:00 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-09 18:13:00 (GMT) |
| commit | 8858521436a302d366b437828128717aaa2cde57 (patch) | |
| tree | 86a4658217f11ba8b42097553f62f7b64b3d27cb /Swiften/Base | |
| parent | 1cea8b4c47e8b03aea7e452fb49b8dea3233eb36 (diff) | |
| download | swift-8858521436a302d366b437828128717aaa2cde57.zip swift-8858521436a302d366b437828128717aaa2cde57.tar.bz2 | |
DateTime refactoring.
Moved DateTime serializing into Base.
Fixed a bug when XEP82 dates are non-UTC.
Added unit tests.
Diffstat (limited to 'Swiften/Base')
| -rw-r--r-- | Swiften/Base/DateTime.cpp | 17 | ||||
| -rw-r--r-- | Swiften/Base/DateTime.h | 9 | ||||
| -rw-r--r-- | Swiften/Base/UnitTest/DateTimeTest.cpp | 43 |
3 files changed, 63 insertions, 6 deletions
diff --git a/Swiften/Base/DateTime.cpp b/Swiften/Base/DateTime.cpp index 1120938..fae26d4 100644 --- a/Swiften/Base/DateTime.cpp +++ b/Swiften/Base/DateTime.cpp @@ -7,19 +7,28 @@ #include <Swiften/Base/DateTime.h> #include <locale> - #include <boost/date_time/time_facet.hpp> +#include <boost/date_time/local_time/local_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp> +#include <Swiften/Base/String.h> + namespace Swift { boost::posix_time::ptime stringToDateTime(const std::string& string) { - static std::locale locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%m-%d %H:%M:%S%F%Q")); + static std::locale locale(std::locale::classic(), new boost::local_time::local_time_input_facet("%Y-%m-%d %H:%M:%S%F%ZP")); std::istringstream stream(string); stream.imbue(locale); - boost::posix_time::ptime result(boost::posix_time::not_a_date_time); + boost::local_time::local_date_time result(boost::date_time::not_a_date_time); stream >> result; - return result; + return result.utc_time(); +} + +std::string dateTimeToString(const boost::posix_time::ptime& time) { + std::string stampString = std::string(boost::posix_time::to_iso_extended_string(time)); + String::replaceAll(stampString, ',', "."); + stampString += "Z"; + return stampString; } } diff --git a/Swiften/Base/DateTime.h b/Swiften/Base/DateTime.h index 309ee56..2407ddc 100644 --- a/Swiften/Base/DateTime.h +++ b/Swiften/Base/DateTime.h @@ -10,8 +10,13 @@ namespace Swift { /** - * Converts a date formatted according to XEP-0082 into a time - * object. + * Converts a date formatted according to XEP-0082 into a ptime + * object (in UTC). */ boost::posix_time::ptime stringToDateTime(const std::string& string); + + /** + * Converts a UTC ptime object to a XEP-0082 formatted string. + */ + std::string dateTimeToString(const boost::posix_time::ptime& time); } diff --git a/Swiften/Base/UnitTest/DateTimeTest.cpp b/Swiften/Base/UnitTest/DateTimeTest.cpp new file mode 100644 index 0000000..8c3903a --- /dev/null +++ b/Swiften/Base/UnitTest/DateTimeTest.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> +#include <string> +#include <boost/date_time/posix_time/posix_time.hpp> + +#include <Swiften/Base/DateTime.h> + +using namespace Swift; + +class DateTimeTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(DateTimeTest); + CPPUNIT_TEST(testStringToDateTime_UTC); + CPPUNIT_TEST(testStringToDateTime_WithTimezone); + CPPUNIT_TEST(testDateTimeToString); + CPPUNIT_TEST_SUITE_END(); + + public: + void testStringToDateTime_UTC() { + boost::posix_time::ptime time = stringToDateTime("1969-07-21T02:56:15Z"); + + CPPUNIT_ASSERT_EQUAL(std::string("1969-07-21T02:56:15"), boost::posix_time::to_iso_extended_string(time)); + } + + void testStringToDateTime_WithTimezone() { + boost::posix_time::ptime time = stringToDateTime("1969-07-20T21:56:15-05:00"); + + CPPUNIT_ASSERT_EQUAL(std::string("1969-07-21T02:56:15"), boost::posix_time::to_iso_extended_string(time)); + } + + void testDateTimeToString() { + boost::posix_time::ptime time = stringToDateTime("1969-07-20T21:56:15-05:00"); + + CPPUNIT_ASSERT_EQUAL(std::string("1969-07-21T02:56:15Z"), dateTimeToString(time)); + } +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(DateTimeTest); |