Changeset f53d684 in sasview for test/sasinvariant

Timestamp:

Dec 5, 2017 10:31:07 AM (7 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 10:31:07)

git-committer:

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

Message:

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

Location:

test/sasinvariant/test

Files:

• utest_data_handling.py (modified) (4 diffs)
• utest_use_cases.py (modified) (6 diffs)

test/sasinvariant/test/utest_data_handling.py

@@ -8 +8 @@
 copyright 2010, University of Tennessee
 """
+
+import os.path
 import unittest
 import math
@@ -15 +17 @@
 
 from sas.sascalc.invariant import invariant
-    
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
+
+
 class TestLinearFit(unittest.TestCase):
     """
@@ -94 +101 @@
     """
     def setUp(self):
-        data = Loader().load("latex_smeared_slit.xml")
+        data = Loader().load(find("latex_smeared_slit.xml"))
         self.data = data[0]
         self.data.dxl = None
@@ -676 +683 @@
             value  = math.fabs(test_y[i]- temp[i])/temp[i]
             self.assert_(value < 0.001)                
-                      

test/sasinvariant/test/utest_use_cases.py

@@ -4 +4 @@
 """
 #TODO: there's no test for smeared extrapolation
+
+import os.path
 import unittest
 from sas.sascalc.dataloader.loader import  Loader
@@ -9 +11 @@
 
 
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
+
+
 class Data1D:
     pass
@@ -18 +24 @@
     """
     def setUp(self):
-        self.data_list = Loader().load("linefittest.txt")
+        self.data_list = Loader().load(find("linefittest.txt"))
         self.data = self.data_list[0]
 
@@ -57 +63 @@
     """
     def setUp(self):
-        self.data_list = Loader().load("linefittest_no_weight.txt")
+        self.data_list = Loader().load(find("linefittest_no_weight.txt"))
         self.data = self.data_list[0]
 
@@ -96 +102 @@
     """
     def setUp(self):
-        self.data_list = Loader().load("PolySpheres.txt")
+        self.data_list = Loader().load(find("PolySpheres.txt"))
         self.data = self.data_list[0]
 
@@ -278 +284 @@
     def setUp(self):
         # data with smear info
-        list = Loader().load("latex_smeared.xml")
+        list = Loader().load(find("latex_smeared.xml"))
         self.data_q_smear = list[0]