Make progress increase monotonically.

1 files changed, 36 insertions, 5 deletions

diff --git a/routing/routing_tests/astar_progress_test.cpp b/routing/routing_tests/astar_progress_test.cpp
index 926fd96606..84daaf70fb 100644
--- a/routing/routing_tests/astar_progress_test.cpp
+++ b/routing/routing_tests/astar_progress_test.cpp
@@ -13,13 +13,44 @@ UNIT_TEST(DirectedAStarProgressCheck)
   m2::PointD middle = m2::PointD(0, 2);
 
   AStarProgress progress(0, 100);
-  progress.Initialise(start, finish);
+  progress.Initialize(start, finish);
   TEST_LESS(progress.GetProgressForDirectedAlgo(start), 0.1f, ());
   TEST_LESS(progress.GetProgressForDirectedAlgo(middle), 50.5f, ());
   TEST_GREATER(progress.GetProgressForDirectedAlgo(middle), 49.5f, ());
   TEST_GREATER(progress.GetProgressForDirectedAlgo(finish), 99.9f, ());
 }
 
+UNIT_TEST(DirectedAStarDegradationCheck)
+{
+  m2::PointD start = m2::PointD(0, 1);
+  m2::PointD finish = m2::PointD(0, 3);
+  m2::PointD middle = m2::PointD(0, 2);
+
+  AStarProgress progress(0, 100);
+  progress.Initialize(start, finish);
+  auto value1 = progress.GetProgressForDirectedAlgo(middle);
+  auto value2 = progress.GetProgressForDirectedAlgo(start);
+  TEST_LESS_OR_EQUAL(value1, value2, ());
+
+  progress.Initialize(start, finish);
+  auto value3 = progress.GetProgressForDirectedAlgo(start);
+  TEST_GREATER_OR_EQUAL(value1, value3, ());
+}
+
+UNIT_TEST(RangeCheckTest)
+{
+  m2::PointD start = m2::PointD(0, 1);
+  m2::PointD finish = m2::PointD(0, 3);
+  m2::PointD preStart = m2::PointD(0, 0);
+  m2::PointD postFinish = m2::PointD(0, 6);
+
+  AStarProgress progress(0, 100);
+  progress.Initialize(start, finish);
+  TEST_EQUAL(progress.GetProgressForDirectedAlgo(preStart), 0.0, ());
+  TEST_EQUAL(progress.GetProgressForDirectedAlgo(postFinish), 0.0, ());
+  TEST_EQUAL(progress.GetProgressForDirectedAlgo(finish), 100.0, ());
+}
+
 UNIT_TEST(DirectedAStarProgressCheckAtShiftedInterval)
 {
   m2::PointD start = m2::PointD(0, 1);
@@ -27,7 +58,7 @@ UNIT_TEST(DirectedAStarProgressCheckAtShiftedInterval)
   m2::PointD middle = m2::PointD(0, 2);
 
   AStarProgress progress(50, 250);
-  progress.Initialise(start, finish);
+  progress.Initialize(start, finish);
   TEST_LESS(progress.GetProgressForDirectedAlgo(start), 50.1f, ());
   TEST_LESS(progress.GetProgressForDirectedAlgo(middle), 150.5f, ());
   TEST_GREATER(progress.GetProgressForDirectedAlgo(middle), 145.5f, ());
@@ -42,10 +73,10 @@ UNIT_TEST(BidirectedAStarProgressCheck)
   m2::PointD bWave = m2::PointD(0, 3);
 
   AStarProgress progress(0.0f, 100.0f);
-  progress.Initialise(start, finish);
+  progress.Initialize(start, finish);
   progress.GetProgressForBidirectedAlgo(fWave, finish);
   float result = progress.GetProgressForBidirectedAlgo(bWave, start);
-  ASSERT_GREATER(result, 49.5, ());
-  ASSERT_LESS(result, 50.5, ());
+  TEST_GREATER(result, 49.5, ());
+  TEST_LESS(result, 50.5, ());
 }
 } //  namespace routing_test