Add more tests

Ebedthan · May 24, 2021 · e4e7521 · e4e7521
1 parent 618c81c
commit e4e7521
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 167 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "sabreur"
 version = "0.3.0"
 authors = ["Anicet Ebou <[email protected]>"]
 edition = "2018"
-exclude = ["CODE_OF_CONDUCT.md", "tests/*", "benches/*", ".github/*"]
+exclude = ["CODE_OF_CONDUCT.md", "tests/*", "benches/*", ".github/*", ".cargo/*"]
 description = "sabreur is a barcode demultiplexing tool for fasta and fastq files"
 homepage = "https://github.com/Ebedthan/sabreur"
 readme = "README.md"

diff --git a/src/main.rs b/src/main.rs
@@ -323,16 +323,15 @@ fn main() -> Result<()> {
 
                 // Demultiplexing
                 writeln!(ohandle, "[INFO] Demultiplexing ...")?;
-                let (stats, is_unk_r1_empty, is_unk_r2_empty) =
-                    utils::pe_fa_demux(
-                        forward,
-                        reverse,
-                        format,
-                        utils::to_niffler_level(raw_level),
-                        &barcode_info,
-                        mismatch,
-                        &mut nb_records,
-                    )?;
+                let (stats, unk_status) = utils::pe_fa_demux(
+                    forward,
+                    reverse,
+                    format,
+                    utils::to_niffler_level(raw_level),
+                    &barcode_info,
+                    mismatch,
+                    &mut nb_records,
+                )?;
 
                 if !quiet {
                     for (key, value) in stats.iter() {
@@ -344,11 +343,13 @@ fn main() -> Result<()> {
                         )?;
                     }
                 }
-                if is_unk_r1_empty {
+                if unk_status == *"truetrue" {
                     fs::remove_file(future_unk_path1)?;
-                } 
-                if is_unk_r2_empty {
                     fs::remove_file(future_unk_path2)?;
+                } else if unk_status == *"falsetrue" {
+                    fs::remove_file(future_unk_path2)?;
+                } else if unk_status == *"truefalse" {
+                    fs::remove_file(future_unk_path1)?;
                 }
             }
         },
@@ -474,16 +475,15 @@ fn main() -> Result<()> {
 
                 // Demultiplexing
                 writeln!(ohandle, "[INFO] Demultiplexing ...")?;
-                let (stats, is_unk_r1_empty, is_unk_r2_empty) =
-                    utils::pe_fq_demux(
-                        forward,
-                        reverse,
-                        format,
-                        utils::to_niffler_level(raw_level),
-                        &barcode_info,
-                        mismatch,
-                        &mut nb_records,
-                    )?;
+                let (stats, unk_status) = utils::pe_fq_demux(
+                    forward,
+                    reverse,
+                    format,
+                    utils::to_niffler_level(raw_level),
+                    &barcode_info,
+                    mismatch,
+                    &mut nb_records,
+                )?;
 
                 if !quiet {
                     for (key, value) in stats.iter() {
@@ -495,11 +495,13 @@ fn main() -> Result<()> {
                         )?;
                     }
                 }
-                if is_unk_r1_empty {
+                if unk_status == *"truetrue" {
                     fs::remove_file(future_unk_path1)?;
-                } 
-                if is_unk_r2_empty {
                     fs::remove_file(future_unk_path2)?;
+                } else if unk_status == *"falsetrue" {
+                    fs::remove_file(future_unk_path2)?;
+                } else if unk_status == *"truefalse" {
+                    fs::remove_file(future_unk_path1)?;
                 }
             }
         },