Changeset f53d684 in sasview for test/pr_inversion

Timestamp:

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

Location:

test/pr_inversion/test

Files:

• utest_explorer.py (modified) (1 diff)
• utest_invertor.py (modified) (16 diffs)

test/pr_inversion/test/utest_explorer.py

@@ -3 +3 @@
 """
 
+import os.path
 import unittest, math, numpy
 from utest_invertor import load
 from sas.sascalc.pr.invertor import Invertor
 from sas.sascalc.pr.distance_explorer import DistExplorer
-        
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
+
+
 class TestExplorer(unittest.TestCase):
             
     def setUp(self):
         self.invertor = Invertor()
-        x, y, err = load('sphere_80.txt')
+        x, y, err = load(find('sphere_80.txt'))
         
         # Choose the right d_max...

test/pr_inversion/test/utest_invertor.py

@@ -10 +10 @@
 
 import os
+import os.path
 import unittest
 import math
 import numpy
 from sas.sascalc.pr.invertor import Invertor
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -28 +33 @@
             self.x_in[i] = 1.0*(i+1)
        
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
 
         # Choose the right d_max...
@@ -192 +197 @@
             Test an inversion for which we know the answer
         """
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
 
         # Choose the right d_max...
@@ -247 +252 @@
             Test an inversion for which we know the answer
         """
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
 
         # Choose the right d_max...
@@ -312 +317 @@
             Test error condition where a point has q=0
         """
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
         x[0] = 0.0
         
@@ -329 +334 @@
             Test error condition where a point has q<0
         """
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
         x[0] = -0.2
         
@@ -353 +358 @@
             Test error condition where a point has q<0
         """
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
         y[0] = 0.0
         
@@ -374 +379 @@
         
     def no_test_time(self):
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
 
         # Choose the right d_max...
@@ -406 +411 @@
         
     def test_save(self):
-        x, y, err = load("sphere_80.txt")
+        x, y, err = load(find("sphere_80.txt"))
 
         # Choose the right d_max...
@@ -464 +469 @@
             Test an inversion for which we know the answer
         """
-        x, y, err = load("data_error_1.txt")
+        x, y, err = load(find("data_error_1.txt"))
 
         # Choose the right d_max...
@@ -482 +487 @@
             Have zero as an error should raise an exception
         """
-        x, y, err = load("data_error_2.txt")
+        x, y, err = load(find("data_error_2.txt"))
 
         # Set data
@@ -495 +500 @@
             Test an inversion for which we know the answer
         """
-        x, y, err = load("data_error_1.txt")
+        x, y, err = load(find("data_error_1.txt"))
 
         # Set data
@@ -511 +516 @@
             An exception should be raised.
         """
-        x, y, err = load("data_error_3.txt")
+        x, y, err = load(find("data_error_3.txt"))
 
         # Set data
@@ -521 +526 @@
             Should not complain or crash.
         """
-        x, y, err = load("data_error_4.txt")
+        x, y, err = load(find("data_error_4.txt"))
 
         # Set data
@@ -535 +540 @@
             Makes not sense, but should not complain or crash.
         """
-        x, y, err = load("data_error_5.txt")
+        x, y, err = load(find("data_error_5.txt"))
 
         # Set data
@@ -549 +554 @@
             Makes not sense, but should not complain or crash.
         """
-        x, y, err = load("data_error_6.txt")
+        x, y, err = load(find("data_error_6.txt"))
 
         # Set data