Changeset 17e257b5 in sasview for test/sasdataloader/test/utest_abs_reader.py

Timestamp:

Aug 24, 2017 2:16:07 PM (7 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d713729

Parents:

f001bc9

Message:

Fix the broken unit tests associated with the readers.

File:

• test/sasdataloader/test/utest_abs_reader.py (modified) (7 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -20 +20 @@
     def setUp(self):
         reader = AbsReader()
-        self.data = reader.read("jan08002.ABS")
+        data = reader.read("jan08002.ABS")
+        self.data= data[0]
 
     def test_abs_checkdata(self):
@@ -69 +70 @@
         # the generic loader should work as well
         data = Loader().load("jan08002.ABS")
-        self.assertEqual(data.meta_data['loader'], "IGOR 1D")
+        self.assertEqual(data[0].meta_data['loader'], "IGOR 1D")
 
 class DanseReaderTests(unittest.TestCase):
@@ -75 +76 @@
     def setUp(self):
         reader = DANSEReader()
-        self.data = reader.read("MP_New.sans")
+        data = reader.read("MP_New.sans")
+        self.data = data[0]
 
     def test_checkdata(self):
@@ -112 +114 @@
         # the generic loader should work as well
         data = Loader().load("MP_New.sans")
-        self.assertEqual(data.meta_data['loader'], "DANSE")
+        self.assertEqual(data[0].meta_data['loader'], "DANSE")
 
 
@@ -257 +259 @@
             self.assertTrue(item.date in ['04-Sep-2007 18:35:02',
                                           '03-SEP-2006 11:42:47'])
-            print(item.term)
             for t in item.term:
                 if (t['name'] == "ABS:DSTAND"
@@ -309 +310 @@
 
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
-        print(self.data.errors)
-        self.assertEqual(len(self.data.errors), 1)
+        self.assertEqual(len(self.data.errors), 0)
 
     def test_slits(self):
@@ -333 +333 @@
         self.assertEqual(self.data.x[1], 0.03)
         self.assertAlmostEquals(self.data.y[1], 1001.0)
-        self.assertEqual(self.data.dx, None)
+        self.assertEqual(self.data.dx[0], 0.0)
         self.assertEqual(self.data.dxl[1], 0.005)
         self.assertEqual(self.data.dxw[1], 0.001)