Changeset fe15198 in sasview

Timestamp:

Oct 25, 2017 5:11:21 AM (6 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, ticket885, unittest-saveload

Children:

3648cbf

Parents:

61f329f0

Message:

Add unit tests to be sure the correct number of data sets are returned when loading data.

Location:

test/sasdataloader/test

Files:

• utest_abs_reader.py (modified) (10 diffs)
• utest_ascii.py (modified) (1 diff)
• utest_averaging.py (modified) (2 diffs)
• utest_red2d_reader.py (modified) (2 diffs)
• utest_sesans.py (modified) (2 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -20 +20 @@
     def setUp(self):
         reader = AbsReader()
-        data = reader.read("jan08002.ABS")
-        self.data= data[0]
+        self.data_list = reader.read("jan08002.ABS")
+        self.data = self.data_list[0]
 
     def test_abs_checkdata(self):
@@ -76 +76 @@
     def setUp(self):
         reader = DANSEReader()
-        data = reader.read("MP_New.sans")
-        self.data = data[0]
+        self.data_list = reader.read("MP_New.sans")
+        self.data = self.data_list[0]
 
     def test_checkdata(self):
@@ -87 +87 @@
             tests won't pass
         """
+        self.assertEqual(len(self.data_list), 1)
         self.assertEqual(self.data.filename, "MP_New.sans")
         self.assertEqual(self.data.meta_data['loader'], "DANSE")
@@ -114 +115 @@
         # the generic loader should work as well
         data = Loader().load("MP_New.sans")
+        self.assertEqual(len(data), 1)
         self.assertEqual(data[0].meta_data['loader'], "DANSE")
 
@@ -121 +123 @@
     def setUp(self):
         reader = CANSASReader()
-        data = reader.read("cansas1d.xml")
-        self.data = data[0]
+        self.data_list = reader.read("cansas1d.xml")
+        self.data = self.data_list[0]
 
     def test_generic_loader(self):
         # the generic loader should work as well
         data = Loader().load("cansas1d.xml")
+        self.assertEqual(len(data), 1)
         self.assertEqual(data[0].meta_data['loader'], "CanSAS XML 1D")
 
@@ -141 +144 @@
             tests won't pass
         """
+        self.assertEqual(len(self.data_list), 1)
         self.assertEqual(self.data.run[0], "1234")
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
@@ -281 +285 @@
         data = Loader().load(filename)
         self.data = data[0]
+        self.assertEqual(len(data), 1)
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -294 +299 @@
         data = CANSASReader().read(filename)
         self.data = data[0]
+        self.assertEqual(len(data), 1)
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -305 +311 @@
         data = CANSASReader().read(filename)
         self.data = data[0]
+        self.assertEqual(len(data), 1)
         self.assertEqual(self.data.filename, filename)
         # The followed should not have been loaded
@@ -321 +328 @@
         data = CANSASReader().read(filename)
         self.data = data[0]
+        self.assertEqual(len(data), 1)
+        self.assertEqual(len(self.data_list), 1)
         self.assertEqual(self.data.filename, filename)
         self.assertEqual(self.data.run[0], "1234")

test/sasdataloader/test/utest_ascii.py

@@ -29 +29 @@
         """
         # The length of the data is 10
+        self.assertEqual(len(self.f1_list), 1)
+        self.assertEqual(len(self.f2_list), 1)
+        self.assertEqual(len(self.f3_list), 1)
+        self.assertEqual(len(self.f4_list), 1)
+        self.assertEqual(len(self.f5_list), 1)
         self.assertEqual(len(self.f1.x), 10)
         self.assertEqual(self.f1.x[0],0.002618)

test/sasdataloader/test/utest_averaging.py

@@ -104 +104 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'MAR07232_rest.h5')
-        self.data = Loader().load(filepath)[0]
+        self.data_list = Loader().load(filepath)
+        self.data = self.data_list[0]
 
     def test_ring(self):
@@ -119 +120 @@
         filepath = os.path.join(os.path.dirname(
             os.path.realpath(__file__)), 'ring_testdata.txt')
-        answer = Loader().load(filepath)[0]
-
+        answer_list = Loader().load(filepath)
+        answer = answer_list[0]
+
+        self.assertEqual(len(answer_list), 1)
         for i in range(r.nbins_phi - 1):
             self.assertAlmostEqual(o.x[i + 1], answer.x[i], 4)

test/sasdataloader/test/utest_red2d_reader.py

@@ -14 +14 @@
     def setUp(self):
         self.loader = Loader()
+        self.data_list = self.loader.load("exp18_14_igor_2dqxqy.dat")
 
     def test_checkdata(self):
@@ -19 +20 @@
             Test .DAT file loaded as IGOR/DAT 2D Q_map
         """
-        f = self.loader.load("exp18_14_igor_2dqxqy.dat")[0]
+        f = self.data_list[0]
         # The length of the data is 10
+        self.assertEqual(len(self.data_list), 1)
         self.assertEqual(len(f.qx_data),  36864)
         self.assertEqual(f.qx_data[0],-0.03573497)

test/sasdataloader/test/utest_sesans.py

@@ -22 +22 @@
         f = file[0]
         # self.assertEqual(f, 5)
+        self.assertEqual(len(file), 1)
         self.assertEqual(len(f.x), 40)
         self.assertEqual(f.x[0], 391.56)
@@ -39 +40 @@
         file = self.loader("sesans_examples/sphere_isis.ses")
         f = file[0]
+        self.assertEqual(len(file), 1)
         self.assertEqual(len(f.x), 57)
         self.assertEqual(f.x[-1], 19303.4)