diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-03 19:17:14 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-17 19:36:50 +0300 |
commit | afea24bc7f403e40cea7f3f067b6cced9dbfd7f9 (patch) | |
tree | b190be76f6a9a8256dc87c4312efa8b3363d54e9 /routing/routing_tests | |
parent | 0b8e94adccd2da6019b6ff5512156e8b1d570123 (diff) |
[bicycle routing] Using attr bicycle=yes or no and oneway:bicycle for bicycle routing.
Diffstat (limited to 'routing/routing_tests')
-rw-r--r-- | routing/routing_tests/vehicle_model_test.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/routing/routing_tests/vehicle_model_test.cpp b/routing/routing_tests/vehicle_model_test.cpp index 7f4bffe8fc..1215dbc5f6 100644 --- a/routing/routing_tests/vehicle_model_test.cpp +++ b/routing/routing_tests/vehicle_model_test.cpp @@ -21,6 +21,8 @@ routing::VehicleModel::InitListT const s_testLimits = { class TestVehicleModel : public routing::VehicleModel { + friend void CheckOneWay(initializer_list<uint32_t> const & types, bool expectedValue); + friend void CheckSpeed(initializer_list<uint32_t> const & types, double expectedSpeed); public: TestVehicleModel() : VehicleModel(classif(), s_testLimits) {} }; @@ -44,7 +46,7 @@ void CheckSpeed(initializer_list<uint32_t> const & types, double expectedSpeed) for (uint32_t t : types) h(t); - TEST_EQUAL(vehicleModel.GetSpeed(h), expectedSpeed, ()); + TEST_EQUAL(vehicleModel.GetMinTypeSpeed(h), expectedSpeed, ()); } void CheckOneWay(initializer_list<uint32_t> const & types, bool expectedValue) @@ -54,9 +56,8 @@ void CheckOneWay(initializer_list<uint32_t> const & types, bool expectedValue) for (uint32_t t : types) h(t); - TEST_EQUAL(vehicleModel.IsOneWay(h), expectedValue, ()); + TEST_EQUAL(vehicleModel.HasOneWayType(h), expectedValue, ()); } - } // namespace UNIT_TEST(VehicleModel_MaxSpeed) |