Changeset f53d684 in sasview for test/sascalculator

Timestamp:

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

Files:

• utest_sas_gen.py (modified) (5 diffs)
• utest_slit_length_calculator.py (modified) (2 diffs)

test/sascalculator/test/utest_sas_gen.py

@@ -2 +2 @@
 Unit tests for the sas_gen
 """
+
+import os.path
 import warnings
 warnings.simplefilter("ignore")
@@ -7 +9 @@
 import unittest
 from sas.sascalc.calculator import sas_gen
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -20 +26 @@
         Test .sld file loaded
         """
-        f = self.sldloader.read("sld_file.sld")
+        f = self.sldloader.read(find("sld_file.sld"))
         self.assertEqual(f.pos_x[0], -40.5)
         self.assertEqual(f.pos_y[0], -13.5)
@@ -29 +35 @@
         Test .pdb file loaded
         """
-        f = self.pdbloader.read("c60.pdb")
+        f = self.pdbloader.read(find("c60.pdb"))
         self.assertEqual(f.pos_x[0], -0.733)
         self.assertEqual(f.pos_y[0], -1.008)
@@ -38 +44 @@
         Test .omf file loaded
         """
-        f = self.omfloader.read("A_Raw_Example-1.omf")
+        f = self.omfloader.read(find("A_Raw_Example-1.omf"))
         output = sas_gen.OMF2SLD()
         output.set_data(f)

test/sascalculator/test/utest_slit_length_calculator.py

@@ -3 +3 @@
 """
 
+import os.path
 import unittest
 from sas.sascalc.dataloader.readers.ascii_reader import Reader
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator \
     as calculator
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -19 +24 @@
             Test slit_length_calculator"
         """
-        list = self.reader.read("beam profile.DAT")
+        list = self.reader.read(find("beam profile.DAT"))
         self.assertTrue(len(list) == 1)
         f = list[0]