Changes in test/sasdataloader/test/utest_abs_reader.py [ce8c7bd:a78a02f] in sasview

File:

• test/sasdataloader/test/utest_abs_reader.py (modified) (10 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):
@@ -47 +48 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertEqual(self.data.x[0], 0.002618)
         self.assertEqual(self.data.x[1], 0.007854)
@@ -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")
 
 
@@ -144 +146 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
-        self.assertEqual(self.data.x_unit, '1/A')
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.x_unit, 'A^{-1}')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertAlmostEqual(self.data.x[0], 0.02, 6)
         self.assertAlmostEqual(self.data.y[0], 1000, 6)
@@ -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):
@@ -324 +324 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
-        self.assertEqual(self.data.x_unit, '1/A')
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.x_unit, 'A^{-1}')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertEqual(self.data.x[0], 0.02)
         self.assertEqual(self.data.y[0], 1000)
@@ -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)