Changeset 248ff73 in sasview for test/sasdataloader

Timestamp:

Aug 1, 2017 11:36:38 AM (7 years ago)

Author:

lewis

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:

5a8cdbb

Parents:

b2c28a5

Message:

Ensure unit tests pass

utest_averaging still fails as it relies on loading in an Igor 2D file,
which is no longer possible

File:

• test/sasdataloader/test/utest_red2d_reader.py (modified) (2 diffs)

test/sasdataloader/test/utest_red2d_reader.py

@@ -7 +7 @@
 import unittest
 from sas.sascalc.dataloader.loader import  Loader
- 
+
 import os.path
 
 class abs_reader(unittest.TestCase):
-    
+
     def setUp(self):
         self.loader = Loader()
-        
+
     def test_checkdata(self):
         """
             Test .DAT file loaded as IGOR/DAT 2D Q_map
         """
-        f = self.loader.load("exp18_14_igor_2dqxqy.dat")
+        f = self.loader.load("exp18_14_igor_2dqxqy.dat")[0]
         # The length of the data is 10
         self.assertEqual(len(f.qx_data),  36864)
@@ -26 +26 @@
         self.assertEqual(f.Q_unit, '1/A')
         self.assertEqual(f.I_unit, '1/cm')
-        
+
         self.assertEqual(f.meta_data['loader'],"IGOR/DAT 2D Q_map")
-        
-        
+
+
 if __name__ == '__main__':
     unittest.main()
-