Change unittest2 back into unittest.
[htsworkflow.git] / htsworkflow / pipelines / test / test_runfolder_ipar100.py
index bf1b520124ab11c01c0ce2a39f39a8d9e83e8cd4..9de36535e2bd3cff21809570c794b525b719f62f 100644 (file)
@@ -4,13 +4,13 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
-import unittest
+from unittest import TestCase
 
 from htsworkflow.pipelines import ipar
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import gerald
 from htsworkflow.pipelines import runfolder
-from htsworkflow.pipelines.runfolder import ElementTree
+from htsworkflow.pipelines import ElementTree
 
 from htsworkflow.pipelines.test.simulate_runfolder import *
 
@@ -33,7 +33,8 @@ def make_runfolder(obj=None):
 
     matrix_dir = os.path.join(ipar_dir, 'Matrix')
     os.mkdir(matrix_dir)
-    make_matrix(matrix_dir)
+    matrix_name = os.path.join(matrix_dir, 's_matrix.txt')
+    make_matrix(matrix_name)
 
     bustard_dir = os.path.join(ipar_dir,
                                'Bustard1.8.28_12-04-2008_diane')
@@ -43,8 +44,8 @@ def make_runfolder(obj=None):
     gerald_dir = os.path.join(bustard_dir,
                               'GERALD_12-04-2008_diane')
     os.mkdir(gerald_dir)
-    make_gerald_config(gerald_dir)
-    make_summary100_htm(gerald_dir)
+    make_gerald_config_100(gerald_dir)
+    make_summary_htm_100(gerald_dir)
     make_eland_multi(gerald_dir)
 
     if obj is not None:
@@ -57,7 +58,7 @@ def make_runfolder(obj=None):
         obj.gerald_dir = gerald_dir
 
 
-class RunfolderTests(unittest.TestCase):
+class RunfolderTests(TestCase):
     """
     Test components of the runfolder processing code
     which includes firecrest, bustard, and gerald
@@ -74,6 +75,7 @@ class RunfolderTests(unittest.TestCase):
         Construct a firecrest object
         """
         i = ipar.ipar(self.image_analysis_dir)
+        self.failUnlessEqual(i.software, 'IPAR')
         self.failUnlessEqual(i.version, '2.01.192.0')
         self.failUnlessEqual(i.start, 1)
         self.failUnlessEqual(i.stop, 37)
@@ -83,6 +85,7 @@ class RunfolderTests(unittest.TestCase):
         xml_str = ElementTree.tostring(xml)
 
         i2 = ipar.IPAR(xml=xml)
+        self.failUnlessEqual(i.software, i2.software)
         self.failUnlessEqual(i.version, i2.version)
         self.failUnlessEqual(i.start,   i2.start)
         self.failUnlessEqual(i.stop,    i2.stop)
@@ -94,6 +97,7 @@ class RunfolderTests(unittest.TestCase):
         construct a bustard object
         """
         b = bustard.bustard(self.bustard_dir)
+        self.failUnlessEqual(b.software, 'Bustard')
         self.failUnlessEqual(b.version, '1.8.28')
         self.failUnlessEqual(b.date,    date(2008,4,12))
         self.failUnlessEqual(b.user,    'diane')
@@ -102,6 +106,7 @@ class RunfolderTests(unittest.TestCase):
 
         xml = b.get_elements()
         b2 = bustard.Bustard(xml=xml)
+        self.failUnlessEqual(b.software, b2.software)
         self.failUnlessEqual(b.version, b2.version)
         self.failUnlessEqual(b.date,    b2.date )
         self.failUnlessEqual(b.user,    b2.user)
@@ -118,9 +123,9 @@ class RunfolderTests(unittest.TestCase):
         # need to update gerald and make tests for it
         g = gerald.gerald(self.gerald_dir)
 
-        self.failUnlessEqual(g.version,
-            '@(#) Id: GERALD.pl,v 1.68.2.2 2007/06/13 11:08:49 km Exp')
-        self.failUnlessEqual(g.date, datetime(2008,4,19,19,8,30))
+        self.failUnlessEqual(g.software, 'GERALD')
+        self.failUnlessEqual(g.version, '1.171')
+        self.failUnlessEqual(g.date, datetime(2009,2,22,21,15,59))
         self.failUnlessEqual(len(g.lanes), len(g.lanes.keys()))
         self.failUnlessEqual(len(g.lanes), len(g.lanes.items()))
 
@@ -129,22 +134,29 @@ class RunfolderTests(unittest.TestCase):
         # make_gerald_config.
         # the first None is to offset the genomes list to be 1..9
         # instead of pythons default 0..8
-        genomes = [None, '/g/dm3', '/g/equcab1', '/g/equcab1', '/g/canfam2',
-                         '/g/hg18', '/g/hg18', '/g/hg18', '/g/hg18', ]
+        genomes = [None,
+                   '/g/mm9',
+                   '/g/mm9',
+                   '/g/elegans190',
+                   '/g/arabidopsis01222004',
+                   '/g/mm9',
+                   '/g/mm9',
+                   '/g/mm9',
+                   '/g/mm9', ]
 
         # test lane specific parameters from gerald config file
         for i in range(1,9):
             cur_lane = g.lanes[i]
-            self.failUnlessEqual(cur_lane.analysis, 'eland')
+            self.failUnlessEqual(cur_lane.analysis, 'eland_extended')
             self.failUnlessEqual(cur_lane.eland_genome, genomes[i])
-            self.failUnlessEqual(cur_lane.read_length, '32')
-            self.failUnlessEqual(cur_lane.use_bases, 'Y'*32)
+            self.failUnlessEqual(cur_lane.read_length, '37')
+            self.failUnlessEqual(cur_lane.use_bases, 'Y'*37)
 
         # I want to be able to use a simple iterator
         for l in g.lanes.values():
-          self.failUnlessEqual(l.analysis, 'eland')
-          self.failUnlessEqual(l.read_length, '32')
-          self.failUnlessEqual(l.use_bases, 'Y'*32)
+          self.failUnlessEqual(l.analysis, 'eland_extended')
+          self.failUnlessEqual(l.read_length, '37')
+          self.failUnlessEqual(l.use_bases, 'Y'*37)
 
         # test data extracted from summary file
         clusters = [None,
@@ -165,6 +177,7 @@ class RunfolderTests(unittest.TestCase):
         g2 = gerald.Gerald(xml=xml)
 
         # do it all again after extracting from the xml file
+        self.failUnlessEqual(g.software, g2.software)
         self.failUnlessEqual(g.version, g2.version)
         self.failUnlessEqual(g.date, g2.date)
         self.failUnlessEqual(len(g.lanes.keys()), len(g2.lanes.keys()))
@@ -189,9 +202,9 @@ class RunfolderTests(unittest.TestCase):
 
             g_eland = g.eland_results
             g2_eland = g2.eland_results
-            for lane in g_eland.results[0].keys():
-                g_results = g_eland.results[0][lane]
-                g2_results = g2_eland.results[0][lane]
+            for key in g_eland:
+                g_results = g_eland[key]
+                g2_results = g2_eland[key]
                 self.failUnlessEqual(g_results.reads,
                                      g2_results.reads)
                 self.failUnlessEqual(len(g_results.mapped_reads),
@@ -218,11 +231,11 @@ class RunfolderTests(unittest.TestCase):
                         5:hg_map, 6:hg_map, 7:hg_map, 8:hg_map }
         eland = gerald.eland(self.gerald_dir, genome_maps=genome_maps)
 
-        for i in range(1,9):
-            lane = eland.results[0][i]
+        for key in eland:
+            lane = eland[key]
             self.failUnlessEqual(lane.reads, 6)
             self.failUnlessEqual(lane.sample_name, "s")
-            self.failUnlessEqual(lane.lane_id, i)
+            self.failUnlessEqual(lane.lane_id, key.lane)
             self.failUnlessEqual(len(lane.mapped_reads), 17)
             self.failUnlessEqual(lane.mapped_reads['hg18/chr5.fa'], 4)
             self.failUnlessEqual(lane.mapped_reads['spike.fa/sample1'], 1)
@@ -241,9 +254,9 @@ class RunfolderTests(unittest.TestCase):
         xml_str = ElementTree.tostring(xml)
         e2 = gerald.ELAND(xml=xml)
 
-        for i in range(1,9):
-            l1 = eland.results[0][i]
-            l2 = e2.results[0][i]
+        for key in eland:
+            l1 = eland[key]
+            l2 = e2[key]
             self.failUnlessEqual(l1.reads, l2.reads)
             self.failUnlessEqual(l1.sample_name, l2.sample_name)
             self.failUnlessEqual(l1.lane_id, l2.lane_id)
@@ -265,29 +278,33 @@ class RunfolderTests(unittest.TestCase):
         # do we get the flowcell id from the filename?
         self.failUnlessEqual(len(runs), 1)
         name = 'run_207BTAAXX_%s.xml' % ( date.today().strftime('%Y-%m-%d'),)
-        self.failUnlessEqual(runs[0].name, name)
+        self.failUnlessEqual(runs[0].serialization_filename, name)
 
         # do we get the flowcell id from the FlowcellId.xml file
         make_flowcell_id(self.runfolder_dir, '207BTAAXY')
         runs = runfolder.get_runs(self.runfolder_dir)
         self.failUnlessEqual(len(runs), 1)
         name = 'run_207BTAAXY_%s.xml' % ( date.today().strftime('%Y-%m-%d'),)
-        self.failUnlessEqual(runs[0].name, name)
+        self.failUnlessEqual(runs[0].serialization_filename, name)
 
         r1 = runs[0]
         xml = r1.get_elements()
         xml_str = ElementTree.tostring(xml)
 
         r2 = runfolder.PipelineRun(xml=xml)
-        self.failUnlessEqual(r1.name, r2.name)
+        self.failUnlessEqual(r1.serialization_filename, r2.serialization_filename)
         self.failIfEqual(r2.image_analysis, None)
         self.failIfEqual(r2.bustard, None)
         self.failIfEqual(r2.gerald, None)
 
 
 def suite():
-    return unittest.makeSuite(RunfolderTests,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
+    return suite
 
-if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
 
+if __name__ == "__main__":
+    from unittest import main
+    main(defaultTest="suite")