Changeset 4cbb2f5 in sasview for test/sasdataloader

Timestamp:

Feb 21, 2019 5:23:13 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

1342f6a, dbfd307

Parents:

e4e9162

Message:

pull conflicting changes from master

Location:

test/sasdataloader/test

Files:

• utest_abs_reader.py (modified) (2 diffs)
• utest_generic_file_reader_class.py (modified) (2 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -77 +77 @@
 
     def test_usans_negative_dxl(self):
-        data_abs = Loader().load(find("sam14_cor.ABS"))
-        data_cor = Loader().load(find("sam14_cor.cor"))
-        for i in range(0, len(data_abs) - 1):
+        data_abs = Loader().load(find("sam14_cor.ABS"))[0]
+        data_cor = Loader().load(find("sam14_cor.txt"))[0]
+        for i in range(0, len(data_abs.x) - 1):
             self.assertEqual(data_abs.x[i], data_cor.x[i])
             self.assertEqual(data_abs.y[i], data_cor.y[i])
-            self.assertEqual(data_abs.dxl[i], data_cor.dxl[i])
-            self.assertEqual(data_abs.dxw[i], data_cor.dxw[i])
-            self.assertTrue(data_abs.dxl > 0)
+            self.assertEqual(data_abs.dxl[i], -data_cor.dx[i])
+            self.assertTrue(data_abs.dxl[i] > 0)
 
 
@@ -118 +117 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.I_unit, '1/cm')
+        self.assertEqual(self.data.I_unit, 'cm^{-1}')
         self.assertEqual(self.data.data[0], 1.57831)
         self.assertEqual(self.data.data[1], 2.70983)

test/sasdataloader/test/utest_generic_file_reader_class.py

@@ -51 +51 @@
     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")
+        no_ext = find("test_data" + os.sep + "TestExtensions")
+        not_xml = find("test_data" + os.sep + "TestExtensions.notxml")
         # Deprecated extensions
-        asc_dep = find("test_data//TestExtensions.asc")
-        nxs_dep = find("test_data//TestExtensions.nxs")
+        asc_dep = find("test_data" + os.sep + "TestExtensions.asc")
+        nxs_dep = find("test_data" + os.sep + "TestExtensions.nxs")
         # Native extension as a baseline
-        xml_native = find("test_data//TestExtensions.xml")
+        xml_native = find("test_data" + os.sep + "TestExtensions.xml")
         # Load the files and check contents
         no_ext_load = self.generic_reader.load(no_ext)
@@ -71 +71 @@
         # Be sure the deprecation warning is passed with the file
         self.assertEqual(len(asc_load[0].errors), 1)
-        self.assertEqual(len(nxs_load[0].errors), 1)
+        self.assertEqual(len(nxs_load[0].errors), 0)
 
     def check_unknown_extension(self, data):