Changeset 00a6ec4 in sasview for test/sasdataloader

Timestamp:

Apr 5, 2017 1:15:25 PM (8 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fd5d6eac

Parents:

4fb10e5 (diff), 5e2f36c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin' into log_binning

Location:

test/sasdataloader/test

Files:

• testLoad.py (modified) (1 diff)
• utest_averaging.py (modified) (9 diffs)

test/sasdataloader/test/testLoad.py

@@ -19 +19 @@
     HAS_IMAGE = True
 except:
-    print "IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE"
+    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE")
     
 import os.path

test/sasdataloader/test/utest_averaging.py

@@ -2 +2 @@
 import unittest
 import math
+import os
 
 from sas.sascalc.dataloader.loader import  Loader
@@ -97 +98 @@
     
     def setUp(self):
-        self.data = Loader().load('MAR07232_rest.ASC')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'MAR07232_rest.ASC')
+        self.data = Loader().load(filepath)
         
     def test_ring(self):
@@ -110 +112 @@
         
         o = r(self.data)
-        answer = Loader().load('ring_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ring_testdata.txt')
+        answer = Loader().load(filepath)
         
         for i in range(r.nbins_phi - 1):
@@ -128 +131 @@
         o = r(self.data)
 
-        answer = Loader().load('avg_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'avg_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(r.nbins_phi):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -163 +167 @@
         o = r(self.data)
 
-        answer = Loader().load('slabx_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'slabx_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -180 +185 @@
         o = r(self.data)
 
-        answer = Loader().load('slaby_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'slaby_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -207 +213 @@
         o = r(self.data)
 
-        answer = Loader().load('ring_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ring_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -225 +232 @@
         o = r(self.data)
 
-        answer = Loader().load('sectorphi_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sectorphi_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -243 +251 @@
         o = r(self.data)
 
-        answer = Loader().load('sectorq_testdata.txt')
+        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sectorq_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)