Changeset 0675e6b in sasview for test/sasdataloader/test/utest_abs_reader.py

Timestamp:

Nov 4, 2017 7:21:04 AM (7 years ago)

Author:

Stuart Prescott <stuart@…>

Parents:

cb11a25

git-author:

Stuart Prescott <stuart@…> (11/02/17 00:50:18)

git-committer:

Stuart Prescott <stuart@…> (11/04/17 07:21:04)

Message:

Fix tests to find resources without changing dir

Test resources are in the same directory (or a child directory) of the test
code so the code can locate the resources itself rather than relying on the
tests being run from a certain location. This allows the tests to be used to
test the installed code rather than the current checkout and also allows
automated test discovery with tools like py.test to be used, running all
tests at once without a runner.

File:

• test/sasdataloader/test/utest_abs_reader.py (modified) (11 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -16 +16 @@
 
 
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
+
+
 class abs_reader(unittest.TestCase):
 
     def setUp(self):
         reader = AbsReader()
-        self.data_list = reader.read("jan08002.ABS")
+        self.data_list = reader.read(find("jan08002.ABS"))
         self.data = self.data_list[0]
 
@@ -31 +35 @@
             tests won't pass
         """
-        self.assertEqual(self.data.filename, "jan08002.ABS")
+        self.assertEqual(os.path.basename(self.data.filename), "jan08002.ABS")
         self.assertEqual(self.data.meta_data['loader'], "IGOR 1D")
 
@@ -69 +73 @@
     def test_generic_loader(self):
         # the generic loader should work as well
-        data = Loader().load("jan08002.ABS")
+        data = Loader().load(find("jan08002.ABS"))
         self.assertEqual(data[0].meta_data['loader'], "IGOR 1D")
 
@@ -76 +80 @@
     def setUp(self):
         reader = DANSEReader()
-        self.data_list = reader.read("MP_New.sans")
+        self.data_list = reader.read(find("MP_New.sans"))
         self.data = self.data_list[0]
 
@@ -88 +92 @@
         """
         self.assertEqual(len(self.data_list), 1)
-        self.assertEqual(self.data.filename, "MP_New.sans")
+        self.assertEqual(os.path.basename(self.data.filename), "MP_New.sans")
         self.assertEqual(self.data.meta_data['loader'], "DANSE")
 
@@ -114 +118 @@
     def test_generic_loader(self):
         # the generic loader should work as well
-        data = Loader().load("MP_New.sans")
+        data = Loader().load(find("MP_New.sans"))
         self.assertEqual(len(data), 1)
         self.assertEqual(data[0].meta_data['loader'], "DANSE")
@@ -123 +127 @@
     def setUp(self):
         reader = CANSASReader()
-        self.data_list = reader.read("cansas1d.xml")
+        self.data_list = reader.read(find("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")
+        data = Loader().load(find("cansas1d.xml"))
         self.assertEqual(len(data), 1)
         self.assertEqual(data[0].meta_data['loader'], "CanSAS XML 1D")
 
     def test_cansas_checkdata(self):
-        self.assertEqual(self.data.filename, "cansas1d.xml")
+        self.assertEqual(os.path.basename(self.data.filename), "cansas1d.xml")
         self._checkdata()
 
@@ -282 +286 @@
 
         filename = "write_test.xml"
-        r.write(filename, self.data)
-        data = Loader().load(filename)
+        r.write(find(filename), self.data)
+        data = Loader().load(find(filename))
         self.data = data[0]
         self.assertEqual(len(data), 1)
@@ -297 +301 @@
         """
         filename = "cansas1d_units.xml"
-        data = CANSASReader().read(filename)
+        data = CANSASReader().read(find(filename))
         self.data = data[0]
         self.assertEqual(len(data), 1)
@@ -309 +313 @@
         """
         filename = "cansas1d_badunits.xml"
-        data = CANSASReader().read(filename)
+        data = CANSASReader().read(find(filename))
         self.data = data[0]
         self.assertEqual(len(data), 1)
@@ -326 +330 @@
         """
         filename = "cansas1d_slit.xml"
-        data = CANSASReader().read(filename)
+        data = CANSASReader().read(find(filename))
         self.data = data[0]
         self.assertEqual(len(data), 1)