updated gurka tests

valhalla · kdiluca · Feb 8, 2021 · Feb 8, 2021 · Feb 9, 2021 · Feb 9, 2021
commit a3e4fd729a5513f6afb446f15c2c56f2e70561d5
diff --git a/src/odin/maneuversbuilder.cc b/src/odin/maneuversbuilder.cc
@@ -58,7 +58,7 @@ constexpr float kSmallEndRampForkThreshold = 0.125f;
 
 // Thresholds for succinct phrase usage
 constexpr uint32_t kMaxWordCount = 5;
-constexpr uint32_t kMaxStreetNameLength = 30;
+constexpr uint32_t kMaxStreetNameLength = 25;
 
 std::vector<std::string> split(const std::string& source, char delimiter) {
   std::vector<std::string> tokens;

diff --git a/test/gurka/gurka.cc b/test/gurka/gurka.cc
@@ -904,6 +904,8 @@ void expect_maneuver_begin_path_indexes(const valhalla::Api& result,
  * @param result the result of a /route or /match request
  * @param maneuver_index the specified maneuver index to inspect
  * @param expected_text_instruction the expected text instruction
+ * @param expected_verbal_succinct_transition_instruction the expected verbal succinct transition
+ *                                                     instruction
  * @param expected_verbal_transition_alert_instruction the expected verbal transition alert
  *                                                     instruction
  * @param expected_verbal_pre_transition_instruction the expected verbal pre-transition instruction
@@ -913,6 +915,7 @@ void expect_instructions_at_maneuver_index(
     const valhalla::Api& result,
     int maneuver_index,
     const std::string& expected_text_instruction,
+    const std::string& expected_verbal_succinct_transition_instruction,
     const std::string& expected_verbal_transition_alert_instruction,
     const std::string& expected_verbal_pre_transition_instruction,
     const std::string& expected_verbal_post_transition_instruction) {
@@ -924,6 +927,8 @@ void expect_instructions_at_maneuver_index(
   const auto& maneuver = result.directions().routes(0).legs(0).maneuver(maneuver_index);
 
   EXPECT_EQ(maneuver.text_instruction(), expected_text_instruction);
+  EXPECT_EQ(maneuver.verbal_succinct_transition_instruction(),
+            expected_verbal_succinct_transition_instruction);
   EXPECT_EQ(maneuver.verbal_transition_alert_instruction(),
             expected_verbal_transition_alert_instruction);
   EXPECT_EQ(maneuver.verbal_pre_transition_instruction(), expected_verbal_pre_transition_instruction);

diff --git a/test/gurka/gurka.h b/test/gurka/gurka.h
@@ -246,6 +246,8 @@ void expect_maneuver_begin_path_indexes(const valhalla::Api& result,
  * @param result the result of a /route or /match request
  * @param maneuver_index the specified maneuver index to inspect
  * @param expected_text_instruction the expected text instruction
+ * @param expected_verbal_succinct_transition_instruction the expected verbal succinct transition
+ *                                                     instruction
  * @param expected_verbal_transition_alert_instruction the expected verbal transition alert
  *                                                     instruction
  * @param expected_verbal_pre_transition_instruction the expected verbal pre-transition instruction
@@ -255,6 +257,7 @@ void expect_instructions_at_maneuver_index(
     const valhalla::Api& result,
     int maneuver_index,
     const std::string& expected_text_instruction,
+    const std::string& expected_verbal_succinct_transition_instruction,
     const std::string& expected_verbal_transition_alert_instruction,
     const std::string& expected_verbal_pre_transition_instruction,
     const std::string& expected_verbal_post_transition_instruction);

diff --git a/test/gurka/test_instructions_bear.cc b/test/gurka/test_instructions_bear.cc
@@ -55,6 +55,7 @@ TEST_F(InstructionsBear, KeepRightBranchToward) {
   // Verify the keep right toward instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(result, maneuver_index,
                                                             "Bear right onto Larkin Street.",
+                                                            "Bear right.",
                                                             "Bear right onto Larkin Street.",
                                                             "Bear right onto Larkin Street.",
                                                             "Continue for 5 kilometers.");
@@ -74,6 +75,7 @@ TEST_F(InstructionsBear, KeepLeftBranchToward) {
   // Verify the keep left toward instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(result, maneuver_index,
                                                             "Bear left onto Hayes Street.",
+                                                            "Bear left.",
                                                             "Bear left onto Hayes Street.",
                                                             "Bear left onto Hayes Street.",
                                                             "Continue for 5 kilometers.");

diff --git a/test/gurka/test_instructions_collapse_double_turn.cc b/test/gurka/test_instructions_collapse_double_turn.cc
@@ -64,14 +64,16 @@ TEST_F(InstructionsCollapseDoubleTurn, CollapseToOneLeft) {
 
   // Verify the L turn instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(
-      result, maneuver_index, "Turn left onto South River Road.", "Turn left onto South River Road.",
+      result, maneuver_index, "Turn left onto South River Road.", "Turn left.",
+      "Turn left onto South River Road.",
       "Turn left onto South River Road. Then Turn left to take the ramp.", "Continue for 50 meters.");
 
   maneuver_index = 2;
 
   // Verify the L turn instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(
       result, maneuver_index, "Turn left to take the ramp.", "Turn left to take the ramp.",
+      "Turn left to take the ramp.",
       "Turn left to take the ramp. Then, in 70 meters, You will arrive at your destination.",
       "Continue for 70 meters.");
 }

diff --git a/test/gurka/test_instructions_collapse_merge.cc b/test/gurka/test_instructions_collapse_merge.cc
@@ -95,7 +95,7 @@ TEST_F(InstructionsCollapseMerge, RightRampMerge) {
   // Ramp right with collapsed merge
   gurka::assert::raw::expect_instructions_at_maneuver_index(
       result, maneuver_index, "Turn right to take the A 76 West ramp toward Pittsburgh.",
-      "Turn right to take the A 76 West ramp.",
+      "Turn right to take the ramp.", "Turn right to take the A 76 West ramp.",
       "Turn right to take the A 76 West ramp toward Pittsburgh.", "Continue for 5 kilometers.");
 
   // Collapsed merge info
@@ -105,6 +105,7 @@ TEST_F(InstructionsCollapseMerge, RightRampMerge) {
   //  gurka::assert::raw::
   //      expect_instructions_at_maneuver_index(result, maneuver_index,
   //                                            "Merge left onto A 76/Pennsylvania Turnpike.",
+  //                                            "Merge left.",
   //                                            "Merge left onto A 76.",
   //                                            "Merge left onto A 76, Pennsylvania Turnpike.",
   //                                            "Continue for 3 kilometers.");
@@ -123,7 +124,7 @@ TEST_F(InstructionsCollapseMerge, LeftRampMerge) {
   // Ramp left with collapsed merge
   gurka::assert::raw::expect_instructions_at_maneuver_index(
       result, maneuver_index, "Turn left to take the A 76 East ramp toward Philedelphia.",
-      "Turn left to take the A 76 East ramp.",
+      "Turn left to take the ramp.", "Turn left to take the A 76 East ramp.",
       "Turn left to take the A 76 East ramp toward Philedelphia.", "Continue for 8 kilometers.");
 
   // Collapsed merge info
@@ -133,6 +134,7 @@ TEST_F(InstructionsCollapseMerge, LeftRampMerge) {
   //  gurka::assert::raw::
   //      expect_instructions_at_maneuver_index(result, maneuver_index,
   //                                            "Merge right onto A 76/Pennsylvania Turnpike.",
+  //                                            "Merge right.",
   //                                            "Merge right onto A 76.",
   //                                            "Merge right onto A 76, Pennsylvania Turnpike.",
   //                                            "Continue for 4 kilometers.");
@@ -153,7 +155,7 @@ TEST_F(InstructionsCollapseMerge, RightRampLeftForkMerge) {
   gurka::assert::raw::expect_instructions_at_maneuver_index(
       result, maneuver_index,
       "Turn right to take the A 76 East/A 70 East ramp toward Philedelphia/Baltimore.",
-      "Turn right to take the A 76 East ramp.",
+      "Turn right to take the ramp.", "Turn right to take the A 76 East ramp.",
       "Turn right to take the A 76 East, A 70 East ramp toward Philedelphia, Baltimore.",
       "Continue for 2.5 kilometers.");
 
@@ -163,7 +165,7 @@ TEST_F(InstructionsCollapseMerge, RightRampLeftForkMerge) {
   gurka::assert::raw::
       expect_instructions_at_maneuver_index(result, maneuver_index,
                                             "Keep left to take A 76/Pennsylvania Turnpike.",
-                                            "Keep left to take A 76.",
+                                            "Keep left at the fork.", "Keep left to take A 76.",
                                             "Keep left to take A 76, Pennsylvania Turnpike.",
                                             "Continue for 8 kilometers.");
   // Collapsed merge info
@@ -173,6 +175,7 @@ TEST_F(InstructionsCollapseMerge, RightRampLeftForkMerge) {
   //  gurka::assert::raw::
   //      expect_instructions_at_maneuver_index(result, maneuver_index,
   //                                            "Merge left onto A 76/Pennsylvania Turnpike.",
+  //                                            "Merge left.",
   //                                            "Merge left onto A 76.",
   //                                            "Merge left onto A 76, Pennsylvania Turnpike.",
   //                                            "Continue for 4 kilometers.");
@@ -193,6 +196,7 @@ TEST_F(InstructionsCollapseMerge, RightRampRightForkMerge) {
   gurka::assert::raw::
       expect_instructions_at_maneuver_index(result, maneuver_index,
                                             "Turn right to take the A 70 East ramp toward Baltimore.",
+                                            "Turn right to take the ramp.",
                                             "Turn right to take the A 70 East ramp.",
                                             "Turn right to take the A 70 East ramp toward Baltimore.",
                                             "Continue for 2.5 kilometers.");
@@ -203,6 +207,7 @@ TEST_F(InstructionsCollapseMerge, RightRampRightForkMerge) {
   gurka::assert::raw::
       expect_instructions_at_maneuver_index(result, maneuver_index,
                                             "Keep right to take A 70 East toward Baltimore.",
+                                            "Keep right at the fork.",
                                             "Keep right to take A 70 East.",
                                             "Keep right to take A 70 East toward Baltimore.",
                                             "Continue for 6 kilometers.");
@@ -213,6 +218,7 @@ TEST_F(InstructionsCollapseMerge, RightRampRightForkMerge) {
   //  // Merge left
   //  gurka::assert::raw::expect_instructions_at_maneuver_index(result, maneuver_index,
   //                                                            "Merge left onto A 70.",
+  //                                                            "Merge left.",
   //                                                            "Merge left onto A 70.",
   //                                                            "Merge left onto A 70.",
   //                                                            "Continue for 4 kilometers.");

diff --git a/test/gurka/test_instructions_collapse_merge_toward.cc b/test/gurka/test_instructions_collapse_merge_toward.cc
@@ -71,7 +71,7 @@ TEST_F(InstructionsCollapseMergeToward, MergeLeftToward) {
   gurka::assert::raw::
       expect_instructions_at_maneuver_index(result, maneuver_index,
                                             "Keep left to take A6 toward Harrisburg/Lancaster.",
-                                            "Keep left to take A6.",
+                                            "Keep left at the fork.", "Keep left to take A6.",
                                             "Keep left to take A6 toward Harrisburg, Lancaster.",
                                             "Continue for 6 kilometers.");
 
@@ -82,6 +82,7 @@ TEST_F(InstructionsCollapseMergeToward, MergeLeftToward) {
   //  gurka::assert::raw::
   //      expect_instructions_at_maneuver_index(result, maneuver_index,
   //                                            "Merge left toward A6/Harrisburg/Lancaster.",
+  //                                            "Merge left.",
   //                                            "Merge left toward A6.",
   //                                            "Merge left toward A6, Harrisburg.",
   //                                            "Continue for 4 kilometers.");

diff --git a/test/gurka/test_instructions_ferry_toward.cc b/test/gurka/test_instructions_ferry_toward.cc
@@ -61,6 +61,7 @@ TEST_F(InstructionsFerryToward, TakeFerryTowardForward) {
   // Verify the ferry toward instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(result, maneuver_index,
                                                             "Take the ferry toward Cape May.",
+                                                            "Take the Ferry.",
                                                             "Take the ferry toward Cape May.",
                                                             "Take the ferry toward Cape May.",
                                                             "Continue for 3 kilometers.");
@@ -82,6 +83,7 @@ TEST_F(InstructionsFerryToward, TakeFerryTowardBackward) {
   // Verify the ferry toward instructions
   gurka::assert::raw::expect_instructions_at_maneuver_index(result, maneuver_index,
                                                             "Take the ferry toward Lewes.",
+                                                            "Take the Ferry.",
                                                             "Take the ferry toward Lewes.",
                                                             "Take the ferry toward Lewes.",
                                                             "Continue for 3 kilometers.");