Changeset 5a8cdbb in sasview for test/sascalculator

Timestamp:

Aug 1, 2017 12:02:35 PM (7 years ago)

Author:

lewis

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:

511ccb2d

Parents:

248ff73 (diff), bc04647 (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 branch 'master' into ticket-876

Location:

test/sascalculator

Files:

• __init__.py (added)
• test/__init__.py (added)
• test/utest_slit_length_calculator.py (modified) (2 diffs)

test/sascalculator/test/utest_slit_length_calculator.py

@@ -5 +5 @@
 import unittest
 from sas.sascalc.dataloader.readers.ascii_reader import Reader
-from  sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator as calculator
+from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator \
+    as calculator
 
-import os.path
 
-class slit_calculator(unittest.TestCase):
+class SlitCalculator(unittest.TestCase):
     
     def setUp(self):
@@ -15 +15 @@
         self.reader = Reader()
         
-    def test_slitlength_calculation(self):
+    def test_slit_length_calculation(self):
         """
             Test slit_length_calculator"
         """
-        f = self.reader.read("beam profile.DAT")
+        list = self.reader.read("beam profile.DAT")
+        self.assertTrue(len(list) == 1)
+        f = list[0]
         cal = calculator()
         cal.set_data(f.x,f.y)
-        slitlength = cal.calculate_slit_length()
+        slit_length = cal.calculate_slit_length()
         
         # The value "5.5858" was obtained by manual calculation.
         # It turns out our slit length is FWHM/2
-        self.assertAlmostEqual(slitlength,5.5858/2, 3)
+        self.assertAlmostEqual(slit_length, 5.5858/2, 3)