Restructure tests

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java

@@ -18,7 +18,6 @@
 import org.opentripplanner.graph_builder.module.StreetLinkerModule;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.Scope;
 import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model.edge.AreaEdge;

application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java

@@ -88,7 +88,7 @@ Iterator<TransitStopVertex> stopIterator() {
   // For speed reasons, graph geometry only within given search radius is considered.
   // Distance is estimated using minimal vertex to vertex search instead of computing
   // distances between graph edges. This is good enough for our heuristics.
-  double distanceFromOtherGraph(Graph index, double searchRadius) {
+  double distanceFromOtherGraph(Graph graph, double searchRadius) {
     Vertex v = getRepresentativeVertex();
     double xscale = Math.cos((v.getCoordinate().y * Math.PI) / 180);
     double searchRadiusDegrees = SphericalDistanceLibrary.metersToDegrees(searchRadius);
@@ -104,7 +104,7 @@ Iterator<TransitStopVertex> stopIterator() {
     }
     envelope.expandBy(searchRadiusDegrees / xscale, searchRadiusDegrees);
 
-    return index
+    return graph
       .findVertices(envelope)
       .stream()
       .filter(vx -> !contains(vx))

application/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java

@@ -32,7 +32,6 @@
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.api.request.request.StreetRequest;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.Scope;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
 import org.opentripplanner.service.osminfo.model.Platform;
 import org.opentripplanner.street.model.StreetTraversalPermission;

application/src/test/java/org/opentripplanner/astar/AStarTest.java

@@ -18,9 +18,9 @@
 import org.opentripplanner.routing.algorithm.MultiTargetTerminationStrategy;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.graph.SimpleConcreteEdge;
-import org.opentripplanner.routing.graph.TemporaryConcreteEdge;
+import org.opentripplanner.street.model._data.SimpleConcreteEdge;
 import org.opentripplanner.street.model._data.StreetModelForTest;
+import org.opentripplanner.street.model._data.TemporaryConcreteEdge;
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.vertex.TemporaryStreetLocation;
 import org.opentripplanner.street.model.vertex.Vertex;

application/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.graph;
+package org.opentripplanner.routing.api;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -25,8 +25,6 @@
 /**
  * Check that the graph index is created, that GTFS elements can be found in the index, and that the
  * indexes are coherent with one another.
- * <p>
- * TODO: The old transit index doesn't exist anymore, and the new one needs more tests.
  */
 public class DefaultRoutingServiceTest extends GtfsTest {
 
@@ -121,14 +119,4 @@ public void testSpatialIndex() {
     assertTrue(stops.contains(stopM));
     assertTrue(stops.size() >= 3); // Query can overselect
   }
-
-  @Test
-  public void testParentStations() {
-    // graph.index.stopsForParentStation;
-  }
-
-  @Test
-  public void testLucene() {
-    // graph.index.luceneIndex
-  }
 }

application/src/test/java/org/opentripplanner/routing/core/GraphTest.java application/src/test/java/org/opentripplanner/routing/graph/GraphTest.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.core;
+package org.opentripplanner.routing.graph;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -11,7 +11,6 @@
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.framework.geometry.GeometryUtils;
-import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model._data.StreetModelForTest;
 import org.opentripplanner.street.model.edge.Edge;
@@ -22,22 +21,22 @@
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.model.vertex.VertexLabel;
 
-public class GraphTest {
+class GraphTest {
 
   @Test
-  public void testBasic() {
+  void testBasic() {
     Graph g = new Graph();
     assertNotNull(g);
   }
 
   @Test
-  public void testAddVertex() {
+  void testAddVertex() {
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     assertEquals(a.getLabel(), VertexLabel.string("A"));
   }
 
   @Test
-  public void testGetVertex() {
+  void testGetVertex() {
     var g = new Graph();
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     g.addVertex(a);
@@ -46,15 +45,15 @@ public void testGetVertex() {
   }
 
   @Test
-  public void testAddEdge() {
+  void testAddEdge() {
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     Vertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
     FreeEdge ee = FreeEdge.createFreeEdge(a, b);
     assertNotNull(ee);
   }
 
   @Test
-  public void testGetEdgesOneEdge() {
+  void testGetEdgesOneEdge() {
     Graph g = new Graph();
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     Vertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
@@ -70,7 +69,7 @@ public void testGetEdgesOneEdge() {
   }
 
   @Test
-  public void testGetEdgesMultiple() {
+  void testGetEdgesMultiple() {
     Graph g = new Graph();
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     Vertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
@@ -92,7 +91,7 @@ public void testGetEdgesMultiple() {
   }
 
   @Test
-  public void testGetStreetEdgesNone() {
+  void testGetStreetEdgesNone() {
     Graph g = new Graph();
     Vertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     Vertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
@@ -109,7 +108,7 @@ public void testGetStreetEdgesNone() {
   }
 
   @Test
-  public void testGetStreetEdgesSeveral() {
+  void testGetStreetEdgesSeveral() {
     Graph g = new Graph();
     StreetVertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     StreetVertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
@@ -131,7 +130,7 @@ public void testGetStreetEdgesSeveral() {
   }
 
   @Test
-  public void testGetEdgesAndVerticesById() {
+  void testGetEdgesAndVerticesById() {
     StreetVertex a = StreetModelForTest.intersectionVertex("A", 5, 5);
     StreetVertex b = StreetModelForTest.intersectionVertex("B", 6, 6);
     StreetVertex c = StreetModelForTest.intersectionVertex("C", 3, 2);

application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java

@@ -0,0 +1,26 @@
+package org.opentripplanner.routing.linking;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.street.model._data.StreetModelForTest;
+import org.opentripplanner.test.support.GeoJsonIo;
+
+class VertexLinkerTest {
+
+  @Test
+  void flex() {
+    var v1 = StreetModelForTest.intersectionVertex(0, 0);
+    var v2 = StreetModelForTest.intersectionVertex(0.1, 0.1);
+    var edge = StreetModelForTest.streetEdge(v1, v2);
+
+    var graph = new Graph();
+
+    graph.addVertex(v1);
+    graph.addVertex(v2);
+    graph.index();
+
+    System.out.println(GeoJsonIo.toUrl(graph));
+  }
+}

application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java application/src/test/java/org/opentripplanner/street/model/_data/SimpleConcreteEdge.java

@@ -1,6 +1,5 @@
-package org.opentripplanner.routing.graph;
+package org.opentripplanner.street.model._data;
 
-import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.street.model.edge.Edge;

application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java application/src/test/java/org/opentripplanner/street/model/_data/TemporaryConcreteEdge.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.graph;
+package org.opentripplanner.street.model._data;
 
 import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
 import org.opentripplanner.framework.i18n.I18NString;

application/src/test/java/org/opentripplanner/routing/graph/EdgeTest.java application/src/test/java/org/opentripplanner/street/model/edge/EdgeTest.java

@@ -1,13 +1,12 @@
-package org.opentripplanner.routing.graph;
+package org.opentripplanner.street.model.edge;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opentripplanner.street.model._data.StreetModelForTest.intersectionVertex;
 
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.street.model.StreetTraversalPermission;
+import org.opentripplanner.street.model._data.SimpleConcreteEdge;
 import org.opentripplanner.street.model._data.StreetModelForTest;
-import org.opentripplanner.street.model.edge.Edge;
-import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
 import org.opentripplanner.street.model.vertex.StreetVertex;
 import org.opentripplanner.street.model.vertex.Vertex;