Changeset 248ff73 in sasview for test

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

Location:

test

Files:

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

test/fileconverter/test/utest_nxcansas_writer.py

@@ -1 +1 @@
 from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter
-from sas.sascalc.dataloader.readers.cansas_reader import Reader as XMLReader
-from sas.sascalc.dataloader.readers.red2d_reader import Reader as DATReader
-from sas.sascalc.dataloader.readers.cansas_reader_HDF5 import Reader as HDF5Reader
+from sas.sascalc.dataloader.loader import Loader
 
 import os
@@ -14 +12 @@
 
     def setUp(self):
+        self.loader = Loader()
         self.writer = NXcanSASWriter()
         self.read_file_1d = "cansas1d.xml"
@@ -19 +18 @@
         self.read_file_2d = "exp18_14_igor_2dqxqy.dat"
         self.write_file_2d = "export2d.h5"
-        self.hdf5_reader = HDF5Reader()
 
-        xml_reader = XMLReader()
-        self.data_1d = xml_reader.read(self.read_file_1d)[0]
+        self.data_1d = self.loader.load(self.read_file_1d)[0]
 
-        dat_reader = DATReader()
-        self.data_2d = dat_reader.read(self.read_file_2d)
+        self.data_2d = self.loader.load(self.read_file_2d)[0]
         self.data_2d.detector[0].name = ''
         self.data_2d.source.radiation = 'neutron'
@@ -31 +27 @@
     def test_write_1d(self):
         self.writer.write([self.data_1d], self.write_file_1d)
-        data = self.hdf5_reader.read(self.write_file_1d)
+        data = self.loader.load(self.write_file_1d)
         self.assertTrue(len(data) == 1)
         data = data[0]
@@ -41 +37 @@
     def test_write_2d(self):
         self.writer.write([self.data_2d], self.write_file_2d)
-        data = self.hdf5_reader.read(self.write_file_2d)
+        data = self.loader.load(self.write_file_2d)
         self.assertTrue(len(data) == 1)
         data = data[0]

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()
-