Can have test generate all files needed

Author: johnlees

src/multisketch.rs

@@ -160,6 +160,7 @@ impl MultiSketch {
 
     pub fn merge_sketches(&mut self, sketch2: &Self) -> &mut Self {
         // First metadata
+        let offset = self.sketch_metadata.len();
         for sketch in sketch2.sketch_metadata.iter() {
             if self.name_map.contains_key(sketch.name()) {
                 panic!(
@@ -168,7 +169,7 @@ impl MultiSketch {
                 );
             } else {
                 let mut temp_sketch: Sketch = sketch.clone();
-                let new_index = temp_sketch.get_index() + self.sketch_metadata.len();
+                let new_index = temp_sketch.get_index() + offset;
                 temp_sketch.set_index(new_index);
                 self.name_map
                     .insert(temp_sketch.name().to_string(), new_index);
@@ -208,6 +209,7 @@ impl fmt::Display for MultiSketch {
 }
 
 // This is only used in the tests
+// Ignores name_map
 impl PartialEq for MultiSketch {
     fn eq(&self, other: &Self) -> bool {
         let mut metadata_match = true;
@@ -249,14 +251,6 @@ impl PartialEq for MultiSketch {
             );
         }
 
-        if self.name_map != other.name_map {
-            metadata_match = false;
-            eprintln!(
-                "Name maps are mismatching. Self: {:?}, Other: {:?}",
-                self.name_map, other.name_map
-            );
-        }
-
         if self.sketch_bins != other.sketch_bins {
             metadata_match = false;
             eprintln!(

tests/merge.rs

@@ -59,33 +59,82 @@ mod tests {
 
         Command::new(cargo_bin("sketchlib"))
             .current_dir(sandbox.get_wd())
-            .arg("merge")
-            .arg(sandbox.file_string("test_merge_sketches1", TestDir::Input))
-            .arg(sandbox.file_string("test_merge_sketches2", TestDir::Input))
+            .arg("sketch")
+            .args(&["--k-vals", "17"])
+            .arg("--seq-files")
+            .arg(sandbox.file_string("14412_3#82.contigs_velvet.fa.gz", TestDir::Input))
+            .arg(sandbox.file_string("14412_3#84.contigs_velvet.fa.gz", TestDir::Input))
             .arg("-v")
-            .args(&["-o", "merge_test"])
+            .args(&["-o", "part1"])
             .assert()
             .success();
 
-        let merged_sketch: MultiSketch =
-            MultiSketch::load(&sandbox.file_string("merge_test", TestDir::Output))
-                .expect("Failed to load output merged sketch");
-        let expected_sketch =
-            MultiSketch::load(&sandbox.file_string("sketches_all", TestDir::Correct))
-                .expect("Failed to load expected merged sketch");
+        Command::new(cargo_bin("sketchlib"))
+            .current_dir(sandbox.get_wd())
+            .arg("sketch")
+            .args(&["--k-vals", "17"])
+            .arg("--seq-files")
+            .arg(sandbox.file_string("R6.fa.gz", TestDir::Input))
+            .arg(sandbox.file_string("TIGR4.fa.gz", TestDir::Input))
+            .arg("-v")
+            .args(&["-o", "part2"])
+            .assert()
+            .success();
+
+        Command::new(cargo_bin("sketchlib"))
+            .current_dir(sandbox.get_wd())
+            .arg("sketch")
+            .args(&["--k-vals", "17"])
+            .arg("--seq-files")
+            .arg(sandbox.file_string("14412_3#82.contigs_velvet.fa.gz", TestDir::Input))
+            .arg(sandbox.file_string("14412_3#84.contigs_velvet.fa.gz", TestDir::Input))
+            .arg(sandbox.file_string("R6.fa.gz", TestDir::Input))
+            .arg(sandbox.file_string("TIGR4.fa.gz", TestDir::Input))
+            .arg("-v")
+            .args(&["-o", "merged_ref"])
+            .assert()
+            .success();
 
+        // Overlapping labels fails
+        Command::new(cargo_bin("sketchlib"))
+            .current_dir(sandbox.get_wd())
+            .arg("merge")
+            .arg("part1")
+            .arg("part1")
+            .arg("-v")
+            .args(&["-o", "merged_test"])
+            .assert()
+            .failure();
+
+        Command::new(cargo_bin("sketchlib"))
+            .current_dir(sandbox.get_wd())
+            .arg("merge")
+            .arg("part1")
+            .arg("part2")
+            .arg("-v")
+            .args(&["-o", "merged_test"])
+            .assert()
+            .success();
+
+        // Check .skd the same
         let predicate_file = predicate::path::eq_file(Path::new(
-            &sandbox.file_string("merge_test.skd", TestDir::Output),
+            &sandbox.file_string("merged_test.skd", TestDir::Output),
         ));
         assert_eq!(
             true,
             predicate_file.eval(Path::new(
-                &sandbox.file_string("sketches_all.skd", TestDir::Correct)
+                &sandbox.file_string("merged_ref.skd", TestDir::Output)
             )),
             "Merged sketch data does not match"
         );
 
-        // assess if sketch metadata are the same
+        // Check .skm the same
+        let merged_sketch: MultiSketch =
+        MultiSketch::load(&sandbox.file_string("merged_test", TestDir::Output))
+            .expect("Failed to load output merged sketch");
+        let expected_sketch =
+            MultiSketch::load(&sandbox.file_string("merged_ref", TestDir::Output))
+                .expect("Failed to load expected merged sketch");
         assert_eq!(
             merged_sketch, expected_sketch,
             "Merged sketch metadata does not match"