Fixes to tests:

- Fix xodr map. - Adds error serialization to assertions. Signed-off-by: Agustin Alba Chicar <ag.albachicar@gmail.com>
maliput · Jun 3, 2024 · 9a3cb03 · 9a3cb03
1 parent a2a220f
commit 9a3cb03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/test/resources/odr/MultipleStraightSegments.xodr b/test/resources/odr/MultipleStraightSegments.xodr
@@ -91,7 +91,6 @@
     <road name="Road 2" length="100.0" id="2" junction="-1">
         <link>
             <predecessor elementType="road" elementId="1" contactPoint="end" />
-            <successor elementType="road" elementId="3" contactPoint="start" />
         </link>
         <planView>
             <geometry s="0.0" x="100.0" y="0.0" hdg="0.0" length="100.0">
@@ -107,7 +106,7 @@
                 <left>
                     <lane id="1" type="driving" level= "0">
                         <link>
-                            <successor id="1" />
+                            <predecessor id="1" />
                         </link>
                         <width sOffset="0.0" a="3.5" b="0.0" c="0.0" d="0.0"/>
                         <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="2.e-01"/>
@@ -119,7 +118,7 @@
                 <center>
                     <lane id="0" type="driving" level= "0">
                         <link>
-                            <successor id="0" />
+                            <predecessor id="0" />
                         </link>
                         <roadMark sOffset="0.0" type="broken" weight="standard" color="standard" width="1.e-01"/>
                         <userData>
@@ -130,7 +129,7 @@
                 <right>
                     <lane id="-1" type="driving" level= "0">
                         <link>
-                            <successor id="-1" />
+                            <predecessor id="-1" />
                         </link>
                         <width sOffset="0.0" a="3.5" b="0.0" c="0.0" d="0.0"/>
                         <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="2.e-01"/>

diff --git a/test/route_end_to_end_connectivity_test.cc b/test/route_end_to_end_connectivity_test.cc
@@ -155,7 +155,7 @@ TEST_F(SinglePhaseTest, SinglePhaseWithTwoLanesAndStartPositionsIsNotConnectedEn
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 TEST_F(SinglePhaseTest, SinglePhaseWithTwoLanesAndEndPositionsIsNotConnectedEndToEnd) {
@@ -170,7 +170,7 @@ TEST_F(SinglePhaseTest, SinglePhaseWithTwoLanesAndEndPositionsIsNotConnectedEndT
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 class MultiPhaseTest : public MultipleStraightSegmentsTest {};
@@ -208,7 +208,7 @@ TEST_F(MultiPhaseTest, MultiPhaseWithOneLaneEachIsNotGeometricallyConnectedEndTo
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 TEST_F(MultiPhaseTest, MultiPhaseWithOneLaneEachIsNotTopologicallyConnectedEndToEnd) {
@@ -226,7 +226,7 @@ TEST_F(MultiPhaseTest, MultiPhaseWithOneLaneEachIsNotTopologicallyConnectedEndTo
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 TEST_F(MultiPhaseTest, MultiPhaseWithDifferrentNumberOfPositionsAtInterfaceIsNotConnectedEndToEnd) {
@@ -247,7 +247,7 @@ TEST_F(MultiPhaseTest, MultiPhaseWithDifferrentNumberOfPositionsAtInterfaceIsNot
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 TEST_F(MultiPhaseTest, MultiPhaseWithinSameLaneIsConnectedEndToEnd) {
@@ -283,7 +283,7 @@ TEST_F(MultiPhaseTest, MultiPhaseWithinSameLaneIsNotGeometricallyConnectedEndToE
 
   const std::vector<std::string> errors = dut.ValidateEndToEndConnectivity();
 
-  ASSERT_FALSE(errors.empty());
+  ASSERT_FALSE(errors.empty()) << SerializeErrors(errors);
 }
 
 }  // namespace