Changeset 2a52b0e in sasview for test/sasdataloader/test/utest_averaging.py

Timestamp:

Aug 2, 2017 3: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?

File:

• test/sasdataloader/test/utest_averaging.py (modified) (8 diffs)

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)