Changeset ade1080 in sasview

Timestamp:

Apr 9, 2017 2:40:35 AM (8 years ago)

Author:

Adam Washington <adam.washington@…>

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:

10ab40e

Parents:

a79ab31

Message:

Call the sesans reader directly in unit test

File:

• test/sasdataloader/test/utest_sesans.py (modified) (5 diffs)

test/sasdataloader/test/utest_sesans.py

@@ -4 +4 @@
 
 import unittest
-from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.readers.sesans_reader import Reader
 
 
@@ -10 +10 @@
 
     def setUp(self):
-        self.loader = Loader()
+        reader = Reader()
+        self.loader = reader.read
 
     def test_sesans_load(self):
@@ -16 +17 @@
             Test .SES file loading
         """
-        f = self.loader.load("sesans_examples/sphere2micron.ses")
+        f = self.loader("sesans_examples/sphere2micron.ses")
         # self.assertEqual(f, 5)
         self.assertEqual(len(f.x), 40)
@@ -33 +34 @@
             Test .SES loading on a TOF dataset
         """
-        f = self.loader.load("sesans_examples/sphere_isis.ses")
+        f = self.loader("sesans_examples/sphere_isis.ses")
         self.assertEqual(len(f.x), 57)
         self.assertEqual(f.x[-1], 19303.4)
@@ -46 +47 @@
             Test .SES loading on a TOF dataset
         """
-        f = self.loader.load("sesans_examples/sesans_no_data.ses")
-        self.assertEqual(len(f.x), 57)
-        self.assertEqual(f.x[-1], 19303.4)
-        self.assertEqual(f.source.wavelength[-1], 13.893668)
-        self.assertEqual(f.source.wavelength[0], 1.612452)
-        self.assertEqual(f.sample.yacceptance, (0.09, "radians"))
-        self.assertEqual(f.sample.zacceptance, (0.09, "radians"))
-        self.assertEqual(f.sample.thickness, 0.2)
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/sesans_no_data.ses")
 
 if __name__ == "__main__":