Refactoring of iso_8601_grammar

* formats 'hh:mm:ss' and ISO 8601 are merged into one grammar.
* iso_8601_grammar is changed to static const.
* iso_8601_grammar supports formats P[n]DT[n]H[n]M[n]S, P[n]W,
  and part of alternative PTHHMMSS and extended PTHH:MM:SS formats.
This commit is contained in:
Michael Krasnyk
2016-05-14 08:46:21 +02:00
parent d5294bb5d0
commit 508c205d35
4 changed files with 112 additions and 148 deletions
+26 -1
View File
@@ -6,17 +6,32 @@
BOOST_AUTO_TEST_SUITE(durations_are_valid)
using namespace osrm;
using namespace osrm::util;
BOOST_AUTO_TEST_CASE(all_necessary_test)
{
BOOST_CHECK_EQUAL(extractor::durationIsValid("0"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("00:01"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("00:01:01"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("61"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("24:01"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("00:01:60"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT15M"), true);
BOOST_CHECK_EQUAL(extractor::durationIsValid(""), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT15"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT15A"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT1H25:01"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT12501"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT0125:01"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT016001"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT240000"), false);
BOOST_CHECK_EQUAL(extractor::durationIsValid("PT24:00:00"), false);
}
BOOST_AUTO_TEST_CASE(common_durations_get_translated)
{
BOOST_CHECK_EQUAL(extractor::parseDuration("00"), 0);
BOOST_CHECK_EQUAL(extractor::parseDuration("10"), 600);
BOOST_CHECK_EQUAL(extractor::parseDuration("00:01"), 60);
BOOST_CHECK_EQUAL(extractor::parseDuration("00:01:01"), 61);
BOOST_CHECK_EQUAL(extractor::parseDuration("01:01"), 3660);
@@ -29,12 +44,22 @@ BOOST_AUTO_TEST_CASE(common_durations_get_translated)
BOOST_CHECK_EQUAL(extractor::parseDuration("PT15H"), 54000);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT1H15M"), 4500);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT1H15M1S"), 4501);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT2H25M6S"), 8706);
BOOST_CHECK_EQUAL(extractor::parseDuration("P1DT2H15M1S"), 94501);
BOOST_CHECK_EQUAL(extractor::parseDuration("P4D"), 345600);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT4H"), 14400);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT71M"), 4260);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT022506"), 8706);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT02:25:06"), 8706);
BOOST_CHECK_EQUAL(extractor::parseDuration("P3W"), 1814400);
}
BOOST_AUTO_TEST_CASE(iso_8601_durations_case_insensitive)
{
BOOST_CHECK_EQUAL(extractor::parseDuration("PT15m"), 900);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT1h15m"), 4500);
BOOST_CHECK_EQUAL(extractor::parseDuration("PT1h15m42s"), 4542);
BOOST_CHECK_EQUAL(extractor::parseDuration("P2dT1h15m42s"), 177342);
}
BOOST_AUTO_TEST_SUITE_END()