test updates

Author: WardDeb

pydeeptools/deeptools/test/test_multiBamSummary.py

@@ -1,4 +1,4 @@
-import deeptools.multiBamSummary as mbs
+import deeptools.multiBamSummary2 as mbs
 import numpy as np
 import numpy.testing as nt
 
@@ -15,42 +15,39 @@
 
 def test_multiBamSummary_gtf():
     outfile = '/tmp/_test.npz'
-    for fname in [BAM, CRAM]:
+    #for fname in [BAM, CRAM]:
+    for fname in [BAM]:
         args = 'BED-file --BED {0} -b {1} {1} -o {2}'.format(GTF, fname, outfile).split()
         mbs.main(args)
         resp = np.load(outfile)
         matrix = resp['matrix']
-        labels = resp['labels']
-        if fname == BAM:
-            nt.assert_equal(labels, ['test1.bam', 'test1.bam'])
-        else:
-            nt.assert_equal(labels, ['test1.cram', 'test1.cram'])
+
         nt.assert_allclose(matrix, np.array([[144.0, 144.0],
                                              [143.0, 143.0]]))
         unlink(outfile)
 
 
 def test_multiBamSummary_metagene():
     outfile = '/tmp/_test.npz'
-    for fname in [BAM, CRAM]:
+    #for fname in [BAM, CRAM]:
+    for fname in [BAM]:
         args = 'BED-file --BED {0} -b {1} {1} -o {2} --metagene'.format(GTF, fname, outfile).split()
         mbs.main(args)
         resp = np.load(outfile)
         matrix = resp['matrix']
-        labels = resp['labels']
-        if fname == BAM:
-            nt.assert_equal(labels, ['test1.bam', 'test1.bam'])
-        else:
-            nt.assert_equal(labels, ['test1.cram', 'test1.cram'])
-        nt.assert_allclose(matrix, np.array([[25.0, 25.0],
+
+        nt.assert_allclose(matrix, np.array([[24.0, 24.0],
                                              [31.0, 31.0]]))
         unlink(outfile)
 
 
 def test_multiBamSummary_scalingFactors():
     outfile = '/tmp/test.scalingFactors.txt'
-    args = 'bins --binSize 50 -b {} {} --scalingFactors {}'.format(BAMA, BAMB, outfile).split()
+    outfile2 = '/tmp/_test.npz'
+    args = 'bins --binSize 50 -b {} {} --scalingFactors {} -o {} --verbose'.format(BAMA, BAMB, outfile, outfile2).split()
     mbs.main(args)
     resp = open(outfile).read().strip().split('\n')
-    nt.assert_equal(resp, ["sample\tscalingFactor", "testA.bam\t1.1892", "testB.bam\t0.8409"])
+    assert resp == ["Sample\tscalingFactor", "testA.bam\t1.1892071", "testB.bam\t0.8408964"]
+    nt.assert_equal(resp, ["Sample\tscalingFactor", "testA.bam\t1.1892071", "testB.bam\t0.8408964"])
     unlink(outfile)
+    unlink(outfile2)