fix: adapt tests to reflect reduced split nodes

mfdz · Jul 25, 2024 · 2ddcf4c · 2ddcf4c
1 parent 4c10f3f
commit 2ddcf4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java
@@ -82,12 +82,10 @@ void linkFlexStop() {
       SplitterVertex walkSplit = (SplitterVertex) linkToWalk.getToVertex();
 
       assertTrue(walkSplit.isConnectedToWalkingEdge());
-      assertFalse(walkSplit.isConnectedToDriveableEdge());
 
       var linkToCar = model.outgoingLinks().getLast();
       SplitterVertex carSplit = (SplitterVertex) linkToCar.getToVertex();
 
-      assertFalse(carSplit.isConnectedToWalkingEdge());
       assertTrue(carSplit.isConnectedToDriveableEdge());
     });
   }

diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
@@ -49,7 +49,7 @@ public void unconnectedCarParkAndRide() {
     int nParkAndRideEdge = gg.getEdgesOfType(VehicleParkingEdge.class).size();
 
     assertEquals(12, nParkAndRide);
-    assertEquals(38, nParkAndRideLink);
+    assertEquals(30, nParkAndRideLink);
     assertEquals(42, nParkAndRideEdge);
   }
 
@@ -66,7 +66,7 @@ public void unconnectedBikeParkAndRide() {
     int nParkAndRideEdge = gg.getEdgesOfType(VehicleParkingEdge.class).size();
 
     assertEquals(13, nParkAndRideEntrances);
-    assertEquals(32, nParkAndRideLink);
+    assertEquals(26, nParkAndRideLink);
     assertEquals(33, nParkAndRideEdge);
   }
 

diff --git a/src/test/java/org/opentripplanner/routing/TestHalfEdges.java b/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
@@ -675,16 +675,16 @@ public void testNetworkLinker() {
     int numVerticesBefore = graph.getVertices().size();
     TestStreetLinkerModule.link(graph, transitModel);
     int numVerticesAfter = graph.getVertices().size();
-    assertEquals(4, numVerticesAfter - numVerticesBefore);
+    assertEquals(2, numVerticesAfter - numVerticesBefore);
     Collection<Edge> outgoing = station1.getOutgoing();
-    assertEquals(2, outgoing.size());
+    assertEquals(1, outgoing.size());
     Edge edge = outgoing.iterator().next();
 
     Vertex midpoint = edge.getToVertex();
     assertTrue(Math.abs(midpoint.getCoordinate().y - 40.01) < 0.00000001);
 
     outgoing = station2.getOutgoing();
-    assertEquals(2, outgoing.size());
+    assertEquals(1, outgoing.size());
     edge = outgoing.iterator().next();
 
     Vertex station2point = edge.getToVertex();

diff --git a/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java b/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
@@ -142,11 +142,11 @@ public void testLinkStopOutsideArea() {
       LOG.debug("Edge {}", e);
     }
 
-    // Two bottom edges gets split into half (+2 edges)
-    // both split points are linked to the stop bidirectonally (+4 edges).
-    // both split points also link to 2 visibility points at opposite side (+8 edges)
-    // 14 new edges in total
-    assertEquals(22, graph.getEdges().size());
+    // Two bottom edges gets split into half (+2 edges) by one (reused) split vertex
+    // the split point is linked to the stop bidirectonally (+2 edges).
+    // the split point also links to 2 visibility points at opposite side (+4 edges)
+    // 8 new edges in total
+    assertEquals(16, graph.getEdges().size());
   }
 
   /**