Changeset f53d684 in sasview for test/sasdataloader/test/utest_abs_reader.py

Timestamp:

Dec 5, 2017 12:31:07 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-1243, ticket-1249, ticket885, unittest-saveload

Children:

5bb05a4

Parents:

3053a4a

git-author:

Stuart Prescott <llimeht@…> (12/05/17 12:31:07)

git-committer:

Paul Kienzle <pkienzle@…> (12/05/17 12:31:07)

Message:

Make tests work from any directory and functional without special runner script (#124)

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)