Changeset 35cf5c0 in sasview

Timestamp:

Apr 9, 2017 5:31:32 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:

1550ee0

Parents:

e801a4e

Message:

Test that SASView complains if SES columns do not match headers

Files:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (1 diff)
• test/sasdataloader/test/sesans_examples/too_many_headers.ses (added)
• test/sasdataloader/test/utest_sesans.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -92 +92 @@
 
             data = np.loadtxt(input_f)
+
+            if data.shape[1] != len(headers):
+                raise RuntimeError(
+                    "File has {} headers, but {} columns".format(
+                        len(headers),
+                        data.shape[1]))
+
             if data.size < 1:
                 raise RuntimeError("{} is empty".format(path))

test/sasdataloader/test/utest_sesans.py

@@ -88 +88 @@
             "sesans_examples/no_wavelength.ses")
 
+    def test_sesans_columns_match_headers(self):
+        """
+            Confirm that sesans files throw an exception if one of the mandator headers is missing.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/too_many_headers.ses")
+
 if __name__ == "__main__":
     unittest.main()