diff options
| author | Sergey Magidovich <mgsergio@mapswithme.com> | 2016-06-06 21:58:28 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-23 18:58:28 +0300 |
| commit | 1e9982157f35585a80a79ed07b8afe297a8744e4 (patch) | |
| tree | baad04b3913bbfd5bd4f9c2454c0694fcbcbe0b3 /3party | |
| parent | 85b8b8ffa54323c939fd30a3decdc32697dfcaf0 (diff) | |
Reject wrong rule in opening_hours_parser.
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/opening_hours/opening_hours_parsers.hpp | 3 | ||||
| -rw-r--r-- | 3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/3party/opening_hours/opening_hours_parsers.hpp b/3party/opening_hours/opening_hours_parsers.hpp index d1e0618ead..37b74f6fb8 100644 --- a/3party/opening_hours/opening_hours_parsers.hpp +++ b/3party/opening_hours/opening_hours_parsers.hpp @@ -373,7 +373,8 @@ public: [bind(&Timespan::SetStart, _val, _1), bind(&Timespan::SetPlus, _val, true)] - | time[bind(&Timespan::SetStart, _val, _1)] + // This rule is only used for collection_times tag wish is not in our interest. + // | time[bind(&Timespan::SetStart, _val, _1)] ; main %= timespan % ','; diff --git a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp index 833462d77c..00e4f54f02 100644 --- a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp +++ b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp @@ -665,11 +665,6 @@ BOOST_AUTO_TEST_CASE(OpeningHours_RuleSequence) BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse) { { - auto const rule = "06:00"; - auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule); - BOOST_CHECK_EQUAL(parsedUnparsed, rule); - } - { auto const rule = "06:00+"; auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule); BOOST_CHECK_EQUAL(parsedUnparsed, rule); @@ -700,9 +695,9 @@ BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse) BOOST_CHECK_EQUAL(parsedUnparsed, rule); } { - auto const rule = "dusk"; + auto const rule = "dusk+"; auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule); - BOOST_CHECK_EQUAL(parsedUnparsed, "sunset"); + BOOST_CHECK_EQUAL(parsedUnparsed, "sunset+"); } { auto const rule = "dawn+"; @@ -715,7 +710,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse) BOOST_CHECK_EQUAL(parsedUnparsed, rule); } { - auto const rule = "(sunset-12:12)"; + auto const rule = "(sunset-12:12)+"; auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule); BOOST_CHECK_EQUAL(parsedUnparsed, rule); } @@ -1005,7 +1000,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse) BOOST_CHECK_EQUAL(parsedUnparsed, rule); } { - auto const rule = "06:00-02:00/21:03, 18:15"; + auto const rule = "06:00-02:00/21:03, 18:15-sunset"; auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule); BOOST_CHECK_EQUAL(parsedUnparsed, rule); } @@ -1048,7 +1043,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse) BOOST_CHECK_EQUAL(parsedUnparsed, rule); } { - auto const rule = "Su-Th (sunset-24:00); Fr-Sa (sunrise+12:12)"; + auto const rule = "Su-Th sunrise-(sunset-24:00); Fr-Sa (sunrise+12:12)-sunset"; auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule); BOOST_CHECK_EQUAL(parsedUnparsed, rule); } |