Move common test helpers to fixtures module

tests/bfs.rs

@@ -1,9 +1,8 @@
 use std::fmt::Debug;
 
 use grapherity::algorithms;
-use grapherity::maps::ElementMap;
+use grapherity::testing::fixtures;
 use grapherity::testing::fixtures::MakeTestGraph;
-use grapherity::traits::GraphTopology;
 
 macro_rules! bfs_tests {
     ($T:ty) => {
@@ -96,8 +95,8 @@ where
 {
     let (graph, vertices, _, _) = G::standard();
     let result = algorithms::bfs(&graph, vertices[0]);
-    assert_bfs_distances::<G>(&result.distances, &vertices);
-    assert_bfs_predecessors::<G>(&result.predecessors, &vertices);
+    fixtures::assert_standard_unweighted_distances_v0(|v| result.distances[v], &vertices);
+    fixtures::assert_standard_unweighted_predecessors_v0(&result.predecessors, &vertices);
 }
 
 fn bfs_distances_single_vertex<G: MakeTestGraph>() {
@@ -135,7 +134,7 @@ where
 {
     let (graph, vertices, _, _) = G::standard();
     let distances = algorithms::bfs_distances(&graph, vertices[0]);
-    assert_bfs_distances::<G>(&distances, &vertices);
+    fixtures::assert_standard_unweighted_distances_v0(|v| distances[v], &vertices);
 }
 
 fn bfs_find_source<G: MakeTestGraph>() {
@@ -161,27 +160,10 @@ where
     G::Vertex: Debug,
 {
     let (graph, vertices, _, _) = G::standard();
-    let expected_distances = [
-        Some(0),
-        Some(1),
-        Some(2),
-        Some(2),
-        Some(2),
-        Some(3),
-        Some(3),
-        Some(3),
-        Some(3),
-        Some(4),
-    ];
-    for i in 0..10 {
-        assert_eq!(
-            algorithms::bfs_find(&graph, vertices[0], vertices[i]),
-            expected_distances[i],
-            "unexpected distance from {:?} to {:?}",
-            vertices[0],
-            vertices[i]
-        );
-    }
+    fixtures::assert_standard_unweighted_distances_v0(
+        |v| algorithms::bfs_find(&graph, vertices[0], v),
+        &vertices,
+    );
 }
 
 fn bfs_find_where_source_matches<G: MakeTestGraph>()
@@ -245,63 +227,3 @@ where
         vertices[8]
     );
 }
-
-fn assert_bfs_distances<G: GraphTopology>(
-    distances: &ElementMap<G::Vertex, Option<u32>>,
-    vertices: &[G::Vertex],
-) where
-    G::Vertex: Debug,
-{
-    let expected = [
-        Some(0),
-        Some(1),
-        Some(2),
-        Some(2),
-        Some(2),
-        Some(3),
-        Some(3),
-        Some(3),
-        Some(3),
-        Some(4),
-    ];
-    for i in 0..10 {
-        assert_eq!(
-            distances[vertices[i]], expected[i],
-            "unexpected distance from {:?} to {:?}",
-            vertices[0], vertices[i]
-        );
-    }
-}
-
-fn assert_bfs_predecessors<G: GraphTopology>(
-    predecessors: &ElementMap<G::Vertex, Option<G::Vertex>>,
-    vertices: &[G::Vertex],
-) where
-    G::Vertex: Debug,
-{
-    assert_eq!(
-        predecessors[vertices[0]], None,
-        "source should have no predecessor"
-    );
-    // Each non-source vertex's predecessor must be adjacent and at distance one less.
-    let expected_predecessors = [
-        vec![None],
-        vec![Some(vertices[0])],
-        vec![Some(vertices[1])],
-        vec![Some(vertices[1])],
-        vec![Some(vertices[1])],
-        vec![Some(vertices[2])],
-        vec![Some(vertices[2]), Some(vertices[3])],
-        vec![Some(vertices[4])],
-        vec![Some(vertices[4])],
-        vec![Some(vertices[5]), Some(vertices[6]), Some(vertices[7])],
-    ];
-    for i in 1..10 {
-        assert!(
-            expected_predecessors[i].contains(&predecessors[vertices[i]]),
-            "unexpected predecessor {:?} of {:?}",
-            predecessors[vertices[i]],
-            vertices[i]
-        );
-    }
-}