diff options
| author | Yury Melnichek <melnichek@gmail.com> | 2011-09-11 14:41:57 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:23:42 +0300 |
| commit | f1efd73fe689d8fbceff7b453567f2660f554aaf (patch) | |
| tree | 38d7c7554c095596adb6a89aeece65d31d0f9991 /geometry/geometry_tests/cellid_test.cpp | |
| parent | 1a54fbfede4a078081e0244771d9476b5c717b15 (diff) | |
CellId refactoring: introduce depth variable and initialise it with DEPTH_LEVELS by default; rename few names and rearrange the code; CelId::IsCellId("") now returns true.
Diffstat (limited to 'geometry/geometry_tests/cellid_test.cpp')
| -rw-r--r-- | geometry/geometry_tests/cellid_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/geometry/geometry_tests/cellid_test.cpp b/geometry/geometry_tests/cellid_test.cpp index 6753121c90..3bc265e9f7 100644 --- a/geometry/geometry_tests/cellid_test.cpp +++ b/geometry/geometry_tests/cellid_test.cpp @@ -147,7 +147,7 @@ UNIT_TEST(CellID_LessQueueOrder) tst.push_back(m2::CellId<4>(e[i])); exp.push_back(m2::CellId<4>(v[i])); } - sort(tst.begin(), tst.end(), m2::CellId<4>::LessQueueOrder()); + sort(tst.begin(), tst.end(), m2::CellId<4>::LessLevelOrder()); TEST_EQUAL(tst, exp, ()); } while (next_permutation(e.begin(), e.end())); } @@ -171,7 +171,7 @@ UNIT_TEST(CellID_LessStackOrder) tst.push_back(m2::CellId<4>(e[i])); exp.push_back(m2::CellId<4>(v[i])); } - sort(tst.begin(), tst.end(), m2::CellId<4>::LessStackOrder()); + sort(tst.begin(), tst.end(), m2::CellId<4>::LessPreOrder()); TEST_EQUAL(tst, exp, ()); } while (next_permutation(e.begin(), e.end())); } @@ -180,7 +180,7 @@ UNIT_TEST(CellID_IsStringValid) { typedef m2::CellId<9> TId; TEST( TId::IsCellId("0123132"), () ); - TEST( !TId::IsCellId(""), () ); + TEST( TId::IsCellId(""), () ); TEST( !TId::IsCellId("-1332"), () ); TEST( !TId::IsCellId("023."), () ); TEST( !TId::IsCellId("121832"), () ); |