Changeset 4a8d55c in sasview for test/sasdataloader

Timestamp:

Mar 27, 2018 12:05:36 PM (7 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

63ddc03

Parents:

2924532

Message:

Propagate through loader when errors are thrown regardless of the error. Add tests using the same file with different extensions (including deprecated extensions).

Location:

test/sasdataloader/test

Files:

• test_data/TestExtensions (added)
• test_data/TestExtensions.asc (added)
• test_data/TestExtensions.notxml (added)
• test_data/TestExtensions.nxs (added)
• test_data/TestExtensions.xml (added)
• utest_generic_file_reader_class.py (modified) (2 diffs)

test/sasdataloader/test/utest_generic_file_reader_class.py

@@ -8 +8 @@
 import numpy as np
 
-from sas.sascalc.dataloader.data_info import DataInfo, plottable_1D
+from sas.sascalc.dataloader.data_info import DataInfo, plottable_1D, Data1D
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.loader_exceptions import NoKnownLoaderException
@@ -49 +49 @@
             self.fail("Errors did not propogate to the file properly.")
 
+    def test_same_file_unknown_extensions(self):
+        # Five files, all with the same content, but different file extensions
+        no_ext = find("test_data//TestExtensions")
+        not_xml = find("test_data//TestExtensions.notxml")
+        # Deprecated extensions
+        asc_dep = find("test_data//TestExtensions.asc")
+        nxs_dep = find("test_data//TestExtensions.nxs")
+        # Native extension as a baseline
+        xml_native = find("test_data//TestExtensions.xml")
+        # Load the files and check contents
+        no_ext_load = self.generic_reader.load(no_ext)
+        asc_load = self.generic_reader.load(asc_dep)
+        nxs_load = self.generic_reader.load(nxs_dep)
+        not_xml_load = self.generic_reader.load(not_xml)
+        xml_load = self.generic_reader.load(xml_native)
+        self.check_unknown_extension(no_ext_load[0])
+        self.check_unknown_extension(asc_load[0])
+        self.check_unknown_extension(nxs_load[0])
+        self.check_unknown_extension(not_xml_load[0])
+        self.check_unknown_extension(xml_load[0])
+        # Be sure the deprecation warning is passed with the file
+        self.assertEquals(len(asc_load[0].errors), 1)
+        self.assertEquals(len(nxs_load[0].errors), 1)
+
+    def check_unknown_extension(self, data):
+        self.assertTrue(isinstance(data, Data1D))
+        self.assertEquals(len(data.x), 138)
+        self.assertEquals(data.sample.ID, "TK49 c10_SANS")
+        self.assertEquals(data.meta_data["loader"], "CanSAS XML 1D")
+
     def tearDown(self):
         if os.path.isfile(self.bad_file):