tests: check entire BarcodeCount structs instead of members, more def…

…ensive
Singular-Genomics · Mar 1, 2024 · 0588ccd · 0588ccd
1 parent 0e7b682
commit 0588ccd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/lib/metrics.rs b/src/lib/metrics.rs
@@ -678,7 +678,7 @@ impl<'a> SampleBarcodeHopTracker<'a> {
 }
 
 /// A helper struct fot serializing and deserializing barcode counts.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub(crate) struct BarcodeCount {
  /// The barcode.
  pub(crate) barcode: String,

diff --git a/src/lib/run.rs b/src/lib/run.rs
@@ -1442,17 +1442,15 @@ s2,CCC,AAA"#;
  let delim = DelimFile::default();
  let hop_metrics: Vec<BarcodeCount> = delim.read_tsv(&hop_metrics).unwrap();
  assert_eq!(hop_metrics.len(), 1);
- assert_eq!(hop_metrics[0].barcode, "TTT+AAA");
- assert_eq!(hop_metrics[0].count, 1);
+ assert_eq!(hop_metrics[0], BarcodeCount { barcode: "TTT+AAA".to_string(), count: 1 });
 
  // Check unmatched metric, should contain the one hopped barcode
  let unmatched_metrics = output.join("most_frequent_unmatched.tsv");
 
  let delim = DelimFile::default();
  let unmatched_metrics: Vec<BarcodeCount> = delim.read_tsv(&unmatched_metrics).unwrap();
  assert_eq!(unmatched_metrics.len(), 1);
- assert_eq!(unmatched_metrics[0].barcode, "TTT+AAA");
- assert_eq!(unmatched_metrics[0].count, 1);
+ assert_eq!(unmatched_metrics[0], BarcodeCount { barcode: "TTT+AAA".to_string(), count: 1 });
  }
 
  #[rstest]
@@ -1602,7 +1600,7 @@ s1,CCC,"#;
  let delim = DelimFile::default();
  let unmatched_metrics: Vec<BarcodeCount> = delim.read_tsv(&unmatched_metrics).unwrap();
  assert_eq!(unmatched_metrics.len(), 1);
- assert_eq!(unmatched_metrics[0].barcode, "TTT");
+ assert_eq!(unmatched_metrics[0], BarcodeCount { barcode: "TTT".to_string(), count: 1 });
 
  // make sure that hop metrics does not exist
  let hop_metrics = output.join("sample_barcode_hop_metrics.tsv");