Changeset 3a0ce4f in sasview

Timestamp:

Dec 13, 2016 10:00:06 AM (8 years ago)

Author:

wojciech

Branches:

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

Children:

debf5c3

Parents:

0532d7c1

Message:

Added a few unit tests

Location:

src/sas/qtgui

Files:

• SlitSizeCalculator.py (modified) (2 diffs)
• UnitTesting/SlitSizeCalculatorTest.py (modified) (3 diffs)

src/sas/qtgui/SlitSizeCalculator.py

@@ -8 +8 @@
 
 import os
+import sys
 
 class SlitSizeCalculator(QtGui.QDialog, Ui_SlitSizeCalculator):
@@ -92 +93 @@
             raise RuntimeError, msg
 
-        if isinstance(data, Data2D):
+        if isinstance(data, Data2D) or data.__class__.__name__ == 'Data2D':
             msg = "Slit Length cannot be computed for 2D Data"
             raise Exception, msg

src/sas/qtgui/UnitTesting/SlitSizeCalculatorTest.py

@@ -10 +10 @@
 
 from SlitSizeCalculator import SlitSizeCalculator
-from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator as calculator
 from sas.sascalc.dataloader.loader import Loader
 
@@ -39 +38 @@
         self.widget.onHelp()
 
-    def testComputeSlit(self):
+    def testCalculateSlitSize(self):
         """ User entered compound calculations and subsequent reset"""
 
@@ -45 +44 @@
         loader = Loader()
         data = loader.load(filename)
-        # Push Compute with the left mouse button
-        cal = calculator()
-        cal.set_data(x = data.x, y = data.y)
-        slitlength = cal.calculate_slit_length()
 
+        self.widget.calculateSlitSize(data)
         # 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(float(self.widget.slit_length_out.text()), 5.5858/2, 3)
+
+    def testCalculateSlitSize2D(self):
+        """ User entered compound calculations and subsequent reset"""
+
+        #TODO: Test for 2D and check if exception is being raised
+        filename = "beam_profile.DAT"
+        loader = Loader()
+        data = loader.load(filename)
+
+        self.widget.calculateSlitSize(data)
+        # The value "5.5858" was obtained by manual calculation.
+        # It turns out our slit length is FWHM/2
+        self.assertAlmostEqual(float(self.widget.slit_length_out.text()), 5.5858/2, 3)
+
+    # def testDataEntryNumbers(self):
+    #      """ User entered compound calculations and subsequent reset"""
+    #
+    #      self.widget.data_file.clear()
+    #      self.widget.data_file.insert("beam profile.DAT")
+    #      #
+    #      # Push Compute with the left mouse button
+    #      computeButton = self.widget.computeButton
+    #      QTest.mouseClick(computeButton, Qt.LeftButton)
+    #      self.assertEqual(self.widget.lengthscale_out.text(), '6.283')
 
     def testBrowseButton(self):