diff options
author | vng <viktor.govako@gmail.com> | 2014-11-04 19:07:39 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:32:15 +0300 |
commit | 39818e3e081419e1307017bf90acc9a886eb64b8 (patch) | |
tree | 3f91418e9da94e0b781bb7c89a4aadddc57c9f37 /map/map_tests | |
parent | d9010aaa5936878077242bc75d12c98d81754def (diff) |
[tests] Check that feature has nonempty geometry if it’s stored in geometry index for the particular scale.
Diffstat (limited to 'map/map_tests')
-rw-r--r-- | map/map_tests/feature_processor_test.cpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/map/map_tests/feature_processor_test.cpp b/map/map_tests/feature_processor_test.cpp index 050c4bdb50..269e2b20c7 100644 --- a/map/map_tests/feature_processor_test.cpp +++ b/map/map_tests/feature_processor_test.cpp @@ -1,15 +1,17 @@ -#include "../../base/SRC_FIRST.hpp" - #include "../../testing/testing.hpp" -#include "../../geometry/screenbase.hpp" -#include "../../base/logging.hpp" #include "../feature_processor.hpp" #include "../geometry_processors.hpp" +#include "../../geometry/screenbase.hpp" + +#include "../../base/logging.hpp" + + + UNIT_TEST(PathPoints_ClipAsIntervals) { - m2::PointD pts[10] = + m2::PointD pts[] = { m2::PointD(0, 0), m2::PointD(10, 0), @@ -42,14 +44,13 @@ UNIT_TEST(PathPoints_ClipAsIntervals) functor_t fun(p); - for (unsigned i = 0; i < 10; ++i) + for (size_t i = 0; i < ARRAY_SIZE(pts); ++i) fun(pts[i]); - fun.IsExist(); + TEST(fun.IsExist(), ()); - double res [2] = {5, 45}; - - TEST(std::equal(intervals.begin(), intervals.end(), res), ()); + double res[] = { 5, 45 }; + TEST(equal(intervals.begin(), intervals.end(), res), ()); typedef gp::filter_screenpts_adapter<gp::cut_path_intervals> cut_functor_t; @@ -61,7 +62,7 @@ UNIT_TEST(PathPoints_ClipAsIntervals) cut_functor_t cut_fun(cp); - for (unsigned i = 0; i < ARRAY_SIZE(pts); ++i) + for (size_t i = 0; i < ARRAY_SIZE(pts); ++i) cut_fun(CoordPointT(pts[i].x, pts[i].y)); m2::PointD res1[] = { @@ -73,12 +74,12 @@ UNIT_TEST(PathPoints_ClipAsIntervals) m2::PointD(25, 10) }; - TEST(std::equal(res1, res1 + ARRAY_SIZE(res1), cut_fun.m_points.back().m_path.begin()), ()); + TEST(equal(res1, res1 + ARRAY_SIZE(res1), cut_fun.m_points.back().m_path.begin()), ()); } UNIT_TEST(PathPoints_DeadZoneClipping) { - m2::PointD pts[10] = + m2::PointD pts[] = { m2::PointD(0, 0), m2::PointD(10, 0), @@ -104,14 +105,10 @@ UNIT_TEST(PathPoints_DeadZoneClipping) p.m_rect = &r; gp::path_points fun(p); - for (unsigned i = 0; i < 10; ++i) + for (size_t i = 0; i < ARRAY_SIZE(pts); ++i) fun(pts[i]); - fun.IsExist(); - -// int pathCount = fun.m_points.size(); + TEST(fun.IsExist(), ()); - di::PathInfo pi = fun.m_points.front(); - vector<m2::PointD> pts1 = fun.m_points.front().m_path; -// LOG(LINFO, (pts1)); + //LOG(LINFO, (fun.m_points.front().m_path)); } |