Test 1.1rc1 style runs, which unfortunately require a hack for parsing

[htsworkflow.git] / htsworkflow / pipelines / test / test_runfolder_pair.py

diff --git a/htsworkflow/pipelines/test/test_runfolder_pair.py b/htsworkflow/pipelines/test/test_runfolder_pair.py
index e5997b7d03cbc922431c1e76e4c824e06a78750e..20dc0d7be08158a08e650aeb3cc456591ac26606 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_pair.py
+++ b/htsworkflow/pipelines/test/test_runfolder_pair.py
@@ -6,7 +6,7 @@ import tempfile
 import shutil
 import unittest
 
-from htsworkflow.pipelines import ipar
+from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import gerald
 from htsworkflow.pipelines import runfolder
@@ -29,7 +29,7 @@ def make_runfolder(obj=None):
     data_dir = os.path.join(runfolder_dir, 'Data')
     os.mkdir(data_dir)
 
-    ipar_dir = make_firecrest_dir(data_dir, "1.9.2", 1, 74)
+    ipar_dir = make_firecrest_dir(data_dir, "1.9.6", 1, 152)
 
     matrix_dir = os.path.join(ipar_dir, 'Matrix')
     os.mkdir(matrix_dir)
@@ -69,25 +69,28 @@ class RunfolderTests(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.temp_dir)
 
-    def test_ipar(self):
+    def test_firecrest(self):
         """
         Construct a firecrest object
         """
-        i = ipar.ipar(self.image_analysis_dir)
-        self.failUnlessEqual(i.version, '2.01.192.0')
-        self.failUnlessEqual(i.start, 1)
-        self.failUnlessEqual(i.stop, 37)
-
-        xml = i.get_elements()
+        f = firecrest.firecrest(self.image_analysis_dir)
+        self.failUnlessEqual(f.version, '1.9.6')
+        self.failUnlessEqual(f.start, 1)
+        self.failUnlessEqual(f.stop, 152)
+        self.failUnlessEqual(f.user, 'diane')
+        # As of 2008-12-8, the date was being set in 
+        # simulate_runfolder.make_firecrest_dir
+        self.failUnlessEqual(f.date, date(2008,4,12))
+
+        xml = f.get_elements()
         # just make sure that element tree can serialize the tree
         xml_str = ElementTree.tostring(xml)
 
-        i2 = ipar.IPAR(xml=xml)
-        self.failUnlessEqual(i.version, i2.version)
-        self.failUnlessEqual(i.start,   i2.start)
-        self.failUnlessEqual(i.stop,    i2.stop)
-        self.failUnlessEqual(i.date,    i2.date)
-        self.failUnlessEqual(i.file_list(), i2.file_list())
+        f2 = firecrest.Firecrest(xml=xml)
+        self.failUnlessEqual(f.version, f2.version)
+        self.failUnlessEqual(f.start,   f2.start)
+        self.failUnlessEqual(f.stop,    f2.stop)
+        self.failUnlessEqual(f.user,    f2.user)
 
     def test_bustard(self):
         """