added test cases for new dynamic thresholding

nhoffman · Feb 21, 2015 · b8f3bdd · b8f3bdd
1 parent f5d6a52
commit b8f3bdd
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/testfiles/classifier/TestClassifier/test11/blast.csv.bz2 b/testfiles/classifier/TestClassifier/test11/blast.csv.bz2
diff --git a/testfiles/classifier/TestClassifier/test11/classifications.csv.bz2 b/testfiles/classifier/TestClassifier/test11/classifications.csv.bz2
diff --git a/testfiles/classifier/TestClassifier/test11/details.csv.bz2 b/testfiles/classifier/TestClassifier/test11/details.csv.bz2
diff --git a/testfiles/classifier/TestClassifier/test11/seq_info.csv.bz2 b/testfiles/classifier/TestClassifier/test11/seq_info.csv.bz2
diff --git a/testfiles/classifier/TestClassifier/test11/taxonomy.csv.bz2 b/testfiles/classifier/TestClassifier/test11/taxonomy.csv.bz2
diff --git a/tests/test_classifier.py b/tests/test_classifier.py
@@ -327,10 +327,9 @@ def test09(self):
         self.assertTrue(filecmp.cmp(classify_ref, classify_out))
         self.assertTrue(filecmp.cmp(details_ref, details_out))
 
-
     def test10(self):
         """
-        Parse non-default blast result files that have haders
+        Parse non-default blast result files that have headers
         """
 
         thisdatadir = self.thisdatadir
@@ -340,7 +339,6 @@ def test10(self):
         outdir = self.mkoutdir()
 
         classify_out = os.path.join(outdir, 'classifications.csv')
-        details_out = os.path.join(outdir, 'details.csv')
 
         blast = os.path.join(thisdatadir, 'blast_extrafields.csv.bz2')
         taxonomy = os.path.join(thisdatadir, 'taxonomy.csv.bz2')
@@ -349,12 +347,9 @@ def test10(self):
         outdir = self.mkoutdir()
 
         classify_out = os.path.join(outdir, 'classifications.csv.bz2')
-        details_out = os.path.join(outdir, 'details.csv.bz2')
 
         classify_ref = os.path.join(
             thisdatadir, this_test, 'classifications.csv.bz2')
-        details_ref = os.path.join(
-            thisdatadir, this_test, 'details.csv.bz2')
 
         args = [
             '--has-header',
@@ -368,3 +363,39 @@ def test10(self):
         self.main(args)
 
         self.assertTrue(filecmp.cmp(classify_ref, classify_out))
+
+    def test11(self):
+        """
+        Test dynamic thresholding
+
+        github issue #32
+        """
+
+        thisdatadir = self.thisdatadir
+
+        this_test = sys._getframe().f_code.co_name
+
+        blast = os.path.join(thisdatadir, this_test, 'blast.csv.bz2')
+        taxonomy = os.path.join(thisdatadir, this_test, 'taxonomy.csv.bz2')
+        seq_info = os.path.join(thisdatadir, this_test, 'seq_info.csv.bz2')
+
+        outdir = self.mkoutdir()
+
+        classify_out = os.path.join(outdir, 'classifications.csv.bz2')
+        details_out = os.path.join(outdir, 'details.csv.bz2')
+
+        classify_ref = os.path.join(
+            thisdatadir, this_test, 'classifications.csv.bz2')
+        details_ref = os.path.join(
+            thisdatadir, this_test, 'details.csv.bz2')
+
+        args = ['--details-out', details_out,
+                '--out', classify_out,
+                blast, seq_info, taxonomy]
+
+        log.info(self.log_info.format(' '.join(map(str, args))))
+
+        self.main(args)
+
+        self.assertTrue(filecmp.cmp(classify_ref, classify_out))
+        self.assertTrue(filecmp.cmp(details_ref, details_out))