Changes in test/sasdataloader/test/utest_sesans.py [a67c494:a78a02f] in sasview

File:

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

test/sasdataloader/test/utest_sesans.py

@@ -4 +4 @@
 
 import unittest
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException,\
+    DefaultReaderException
 from sas.sascalc.dataloader.readers.sesans_reader import Reader
 from sas.sascalc.dataloader.loader import  Loader
@@ -17 +19 @@
             Test .SES in the full loader to make sure that the file type is correctly accepted
         """
-        f = Loader().load("sesans_examples/sphere2micron.ses")
+        file = Loader().load("sesans_examples/sphere2micron.ses")
+        f = file[0]
         # self.assertEqual(f, 5)
         self.assertEqual(len(f.x), 40)
@@ -34 +37 @@
             Test .SES loading on a TOF dataset
         """
-        f = self.loader("sesans_examples/sphere_isis.ses")
+        file = self.loader("sesans_examples/sphere_isis.ses")
+        f = file[0]
         self.assertEqual(len(f.x), 57)
         self.assertEqual(f.x[-1], 19303.4)
@@ -48 +52 @@
         """
         self.assertRaises(
-            RuntimeError,
+            FileContentsException,
             self.loader,
             "sesans_examples/sesans_no_data.ses")
@@ -57 +61 @@
         """
         self.assertRaises(
-            RuntimeError,
+            FileContentsException,
             self.loader,
             "sesans_examples/no_spin_echo_unit.ses")
-
-    def test_sesans_no_version(self):
-        """
-            Confirm that sesans files with no file format version raise an appropriate error
-        """
-        self.assertRaises(
-            RuntimeError,
-            self.loader,
-            "sesans_examples/no_version.ses")
 
     def test_sesans_future_version(self):
@@ -75 +70 @@
         """
         self.assertRaises(
-            RuntimeError,
+            FileContentsException,
             self.loader,
             "sesans_examples/next_gen.ses")
@@ -84 +79 @@
         """
         self.assertRaises(
-            RuntimeError,
+            FileContentsException,
             self.loader,
             "sesans_examples/no_wavelength.ses")
@@ -93 +88 @@
         """
         self.assertRaises(
-            RuntimeError,
+            FileContentsException,
             self.loader,
             "sesans_examples/too_many_headers.ses")