Changeset 2a52b0e in sasview

Timestamp:

Aug 2, 2017 5:37:27 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:

3eb7bf2

Parents:

be43448

Message:

Remove unit test reliance on IgorReader?

Location:

test/sasdataloader/test

Files:

• MAR07232_rest.ASC (deleted)
• MAR07232_rest.h5 (added)
• utest_abs_reader.py (modified) (1 diff)
• utest_averaging.py (modified) (8 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -101 +101 @@
         data = Loader().load("S2-30dq.d1d")
         self.assertEqual(data.meta_data['loader'], "HFIR 1D")
-
-
-class igor_reader(unittest.TestCase):
-
-    def setUp(self):
-        # the IgorReader should be able to read this filetype
-        # if it can't, stop here.
-        reader = IgorReader()
-        self.data = reader.read("MAR07232_rest.ASC")
-
-    def test_igor_checkdata(self):
-        """
-            Check the data content to see whether
-            it matches the specific file we loaded.
-            Check the units too to see whether the
-            Data1D defaults changed. Otherwise the
-            tests won't pass
-        """
-        self.assertEqual(self.data.filename, "MAR07232_rest.ASC")
-        self.assertEqual(self.data.meta_data['loader'], "IGOR 2D")
-
-        self.assertEqual(self.data.source.wavelength_unit, 'A')
-        self.assertEqual(self.data.source.wavelength, 8.4)
-
-        self.assertEqual(self.data.detector[0].distance_unit, 'mm')
-        self.assertEqual(self.data.detector[0].distance, 13705)
-
-        self.assertEqual(self.data.sample.transmission, 0.84357)
-
-        self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
-        center_x = (68.76 - 1)*5.0
-        center_y = (62.47 - 1)*5.0
-        self.assertEqual(self.data.detector[0].beam_center.x, center_x)
-        self.assertEqual(self.data.detector[0].beam_center.y, center_y)
-
-        self.assertEqual(self.data.I_unit, '1/cm')
-        # 3 points should be suffcient to check that the data is in column
-        # major order.
-        np.testing.assert_almost_equal(self.data.data[0:3],
-                                       [0.279783, 0.28951, 0.167634])
-        np.testing.assert_almost_equal(self.data.qx_data[0:3],
-                                       [-0.01849072, -0.01821785, -0.01794498])
-        np.testing.assert_almost_equal(self.data.qy_data[0:3],
-                                       [-0.01677435, -0.01677435, -0.01677435])
-
-    def test_generic_loader(self):
-        # the generic loader should direct the file to IgorReader as well
-        data = Loader().load("MAR07232_rest.ASC")
-        self.assertEqual(data.meta_data['loader'], "IGOR 2D")
-
 
 class DanseReaderTests(unittest.TestCase):

test/sasdataloader/test/utest_averaging.py

@@ -103 +103 @@
     def setUp(self):
         filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'MAR07232_rest.ASC')
-        self.data = Loader().load(filepath)
+            os.path.realpath(__file__)), 'MAR07232_rest.h5')
+        self.data = Loader().load(filepath)[0]
 
     def test_ring(self):
@@ -119 +119 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'ring_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
 
         for i in range(r.nbins_phi - 1):
@@ -139 +139 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'avg_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(r.nbins_phi):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -175 +175 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'slabx_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -194 +194 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'slaby_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -221 +221 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'ring_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -239 +239 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'sectorphi_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -257 +257 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'sectorq_testdata.txt')
-        answer = Loader().load(filepath)
+        answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)