From 93b8f1993cc39ce4b72192ce0e7367b7641804a4 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Mon, 11 Apr 2016 15:35:49 +0200 Subject: [PATCH] Split off parameters I/O from unit tests --- unit_tests/server/parameters_io.hpp | 59 +++++++++++++++++++++++++ unit_tests/server/parameters_parser.cpp | 52 +--------------------- 2 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 unit_tests/server/parameters_io.hpp diff --git a/unit_tests/server/parameters_io.hpp b/unit_tests/server/parameters_io.hpp new file mode 100644 index 000000000..dd2bd6c0f --- /dev/null +++ b/unit_tests/server/parameters_io.hpp @@ -0,0 +1,59 @@ +#ifndef OSRM_TEST_SERVER_PARAMETERS_IO +#define OSRM_TEST_SERVER_PARAMETERS_IO + +#include "engine/api/route_parameters.hpp" +#include "engine/bearing.hpp" + +#include + +namespace osrm +{ +namespace engine +{ +namespace api +{ +inline std::ostream &operator<<(std::ostream &out, api::RouteParameters::GeometriesType geometries) +{ + switch (geometries) + { + case api::RouteParameters::GeometriesType::GeoJSON: + out << "GeoJSON"; + break; + case api::RouteParameters::GeometriesType::Polyline: + out << "Polyline"; + break; + default: + BOOST_ASSERT_MSG(false, "GeometriesType not fully captured"); + } + return out; +} + +inline std::ostream &operator<<(std::ostream &out, api::RouteParameters::OverviewType overview) +{ + switch (overview) + { + case api::RouteParameters::OverviewType::False: + out << "False"; + break; + case api::RouteParameters::OverviewType::Full: + out << "Full"; + break; + case api::RouteParameters::OverviewType::Simplified: + out << "Simplified"; + break; + default: + BOOST_ASSERT_MSG(false, "OverviewType not fully captured"); + } + return out; +} +} + +inline std::ostream &operator<<(std::ostream &out, Bearing bearing) +{ + out << bearing.bearing << "," << bearing.range; + return out; +} +} +} + +#endif diff --git a/unit_tests/server/parameters_parser.cpp b/unit_tests/server/parameters_parser.cpp index 1b5161f71..24a04def4 100644 --- a/unit_tests/server/parameters_parser.cpp +++ b/unit_tests/server/parameters_parser.cpp @@ -1,5 +1,7 @@ #include "server/api/parameters_parser.hpp" +#include "parameters_io.hpp" + #include "engine/api/base_parameters.hpp" #include "engine/api/match_parameters.hpp" #include "engine/api/nearest_parameters.hpp" @@ -8,56 +10,6 @@ #include "engine/api/tile_parameters.hpp" #include "engine/api/trip_parameters.hpp" -#include - -namespace osrm -{ -namespace engine -{ -namespace api -{ -std::ostream &operator<<(std::ostream &out, api::RouteParameters::GeometriesType geometries) -{ - switch (geometries) - { - case api::RouteParameters::GeometriesType::GeoJSON: - out << "GeoJSON"; - break; - case api::RouteParameters::GeometriesType::Polyline: - out << "Polyline"; - break; - default: - BOOST_ASSERT_MSG(false, "GeometriesType not fully captured"); - } - return out; -} -std::ostream &operator<<(std::ostream &out, api::RouteParameters::OverviewType overview) -{ - switch (overview) - { - case api::RouteParameters::OverviewType::False: - out << "False"; - break; - case api::RouteParameters::OverviewType::Full: - out << "Full"; - break; - case api::RouteParameters::OverviewType::Simplified: - out << "Simplified"; - break; - default: - BOOST_ASSERT_MSG(false, "OverviewType not fully captured"); - } - return out; -} -} -std::ostream &operator<<(std::ostream &out, Bearing bearing) -{ - out << bearing.bearing << "," << bearing.range; - return out; -} -} -} - #include #include #include