Replaced assert_eq with methods in traits::graph

Author: vigna

webgraph/src/graphs/arc_list_graph.rs

@@ -236,13 +236,13 @@ mod test {
         let coo = ArcListGraph::new_labeled(g.num_nodes(), arcs.iter().copied());
         let g2 = LabeledBTreeGraph::<_>::from_lender(coo.iter());
 
-        assert_eq!(g, g2);
+        graph::eq_labeled(&g, &g2)?;
 
         let g = LabeledVecGraph::<_>::from_arcs(arcs);
         let coo = ArcListGraph::new_labeled(g.num_nodes(), arcs.iter().copied());
         let g2 = LabeledVecGraph::<_>::from_lender(coo.iter());
 
-        assert_eq!(g, g2);
+        graph::eq_labeled(&g, &g2)?;
 
         Ok(())
     }

webgraph/tests/test_btree_graph.rs

@@ -16,11 +16,14 @@ fn test_remove() {
 
 #[cfg(feature = "serde")]
 #[test]
-fn test_serde() {
+fn test_serde() -> anyhow::Result<()> {
+    use webgraph::traits::graph;
+
     let arcs = [(0, 1, 1), (0, 2, 2), (1, 2, 3)];
 
     let g = LabeledBTreeGraph::<usize>::from_arcs(arcs);
     let res = serde_json::to_string(&g).unwrap();
     let p: LabeledBTreeGraph<usize> = serde_json::from_str(&res).unwrap();
-    assert_eq!(g, p);
+    graph::eq_labeled(&g, &p)?;
+    Ok(())
 }

webgraph/tests/test_transpose.rs

@@ -11,7 +11,7 @@ use dsi_bitstream::traits::{BitRead, BitWrite};
 use webgraph::graphs::vec_graph::LabeledVecGraph;
 use webgraph::prelude::{transpose, transpose_labeled};
 use webgraph::traits::labels::SequentialLabeling;
-use webgraph::traits::{BitDeserializer, BitSerializer};
+use webgraph::traits::{graph, BitDeserializer, BitSerializer};
 use webgraph::utils::sort_pairs::{BitReader, BitWriter};
 
 #[test]
@@ -26,7 +26,7 @@ fn test_transpose() -> anyhow::Result<()> {
     let trans = transpose(g2, 3)?;
     let g3 = VecGraph::from_lender(&trans);
 
-    assert_eq!(g, g3);
+    graph::eq(&g, &g3)?;
     Ok(())
 }
 
@@ -95,6 +95,6 @@ fn test_transpose_labeled() -> anyhow::Result<()> {
 
     let g4 = LabeledVecGraph::from_lender(g.iter());
 
-    assert_eq!(g3, g4);
+    graph::eq_labeled(&g3, &g4)?;
     Ok(())
 }

webgraph/tests/test_vec_graph.rs

@@ -5,20 +5,23 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
+use webgraph::traits::graph;
+
 #[cfg(feature = "serde")]
 #[test]
-fn test_serde() {
+fn test_serde() -> anyhow::Result<()> {
     use webgraph::graphs::vec_graph::LabeledVecGraph;
     let arcs = [(0, 1, 1), (0, 2, 2), (1, 2, 3)];
 
     let g = LabeledVecGraph::<usize>::from_arcs(arcs);
     let res = serde_json::to_string(&g).unwrap();
     let p: LabeledVecGraph<usize> = serde_json::from_str(&res).unwrap();
-    assert_eq!(g, p);
+    graph::eq_labeled(&g, &p)?;
+    Ok(())
 }
 
 #[test]
-fn test_epserde() {
+fn test_epserde() -> anyhow::Result<()> {
     use epserde::prelude::*;
     use webgraph::graphs::vec_graph::LabeledVecGraph;
     let arcs = [(0, 1, 1), (0, 2, 2), (1, 2, 3)];
@@ -29,5 +32,6 @@ fn test_epserde() {
     g.serialize(&mut file).unwrap();
     let data = file.into_inner();
     let g2 = <LabeledVecGraph<usize>>::deserialize_eps(&data).unwrap();
-    assert_eq!(g, g2);
+    graph::eq_labeled(&g, &g2)?;
+    Ok(())
 }