Changeset 99ea1b0 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Oct 27, 2017 8:49:35 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

0849aec

Parents:

895e7359

Message:

Update for unit tests and minor functionality quirks

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingLogicTest.py (modified) (1 diff)
• UnitTesting/FittingOptionsTest.py (modified) (1 diff)
• UnitTesting/FittingPerspectiveTest.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (6 diffs, 1 prop)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -566 +566 @@
         model_row = item.row()
         name_index = self._poly_model.index(model_row, 0)
-        parameter_name = str(name_index.data().toString()).lower() # "distribution of sld" etc.
+        parameter_name = str(name_index.data()).lower() # "distribution of sld" etc.
         if "distribution of" in parameter_name:
             # just the last word

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -3 +3 @@
 
 import numpy
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -6 +6 @@
 from PyQt4 import QtWebKit
 
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

@@ -6 +6 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -6 +6 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 from twisted.internet import threads
 
@@ -60 +60 @@
 
         #Test loading from json categories
-        category_list = fittingWindow.master_category_dict.keys()
+        category_list = list(fittingWindow.master_category_dict.keys())
 
         for category in category_list:
@@ -93 +93 @@
         fittingWindow.SASModelToQModel("cylinder")
         pd_index = fittingWindow.lstPoly.model().index(0,0)
-        self.assertEqual(str(pd_index.data().toString()), "Distribution of radius")
+        self.assertEqual(str(pd_index.data()), "Distribution of radius")
         pd_index = fittingWindow.lstPoly.model().index(1,0)
-        self.assertEqual(str(pd_index.data().toString()), "Distribution of length")
+        self.assertEqual(str(pd_index.data()), "Distribution of length")
 
         # test the delegate a bit
         delegate = fittingWindow.lstPoly.itemDelegate()
         self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 5)
-        self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
+        self.assertEqual(delegate.editableParameters(), [1, 2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
@@ -361 +361 @@
 
         # Test presence of comboboxes in last column
-        for row in xrange(self.widget._poly_model.rowCount()):
+        for row in range(self.widget._poly_model.rowCount()):
             func_index = self.widget._poly_model.index(row, 6)
             self.assertTrue(isinstance(self.widget.lstPoly.indexWidget(func_index), QtGui.QComboBox))
@@ -509 +509 @@
 
         # Test rows
-        for row in xrange(self.widget._magnet_model.rowCount()):
+        for row in range(self.widget._magnet_model.rowCount()):
             func_index = self.widget._magnet_model.index(row, 0)
             self.assertIn(':', self.widget._magnet_model.item(row, 0).text())
@@ -889 +889 @@
 
         # check that range of variation for this parameter has NOT been changed
-        print self.widget.kernel_module.details[name_modified_param]
+        print(self.widget.kernel_module.details[name_modified_param])
         self.assertNotIn(new_value, self.widget.kernel_module.details[name_modified_param] )