Changeset b9c4c1e1 in sasview

Timestamp:

Feb 22, 2017 5:51:53 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:

84be77e

Parents:

0efe791

Message:

Unit tests added for selecting models, categories and structure factors

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (modified) (3 diffs)
• UnitTesting/FittingPerspectiveTest.py (modified) (1 diff)

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

@@ -17 +17 @@
     Main window for selecting form and structure factor models
     """
-    name = "Fitting" # For displaying in the combo box
     def __init__(self, manager=None, parent=None):
         """
@@ -26 +25 @@
         """
         super(FittingWindow, self).__init__()
-
+        self.setupUi(self)
+
+        self.setWindowTitle("Fitting")
         self._model_model = QtGui.QStandardItemModel()
         self._poly_model = QtGui.QStandardItemModel()
-        self.setupUi(self)
         self.tableView.setModel(self._model_model)
 
@@ -53 +53 @@
         self.chkSmearing.setEnabled(False)
 
-        #TODO: Can these be removed?
         self.lblMinRangeDef.setText("---")
         self.lblMaxRangeDef.setText("---")

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

@@ -21 +21 @@
     def tearDown(self):
         """Destroy the GUI"""
+        self.widget.close()
         self.widget = None
 
     def testDefaults(self):
         """Test the GUI in its default state"""
-        self.assertIsInstance(self.widget, QtGui.QMainWindow)
-        self.assertIsInstance(self.widget.centralWidget(), QtGui.QWorkspace)
+        self.assertIsInstance(self.widget, QtGui.QWidget)
+        self.assertEqual(self.widget.windowTitle(), "Fitting")
+        self.assertEqual(self.widget.sizePolicy().Policy(), QtGui.QSizePolicy.Fixed)
 
-    def testExit(self):
+    def testSelectCategory(self):
         """
-        Test that the custom exit method is called on shutdown
+        Test if categories have been load properly
+        :return:
         """
-        # Must mask sys.exit, otherwise the whole testing process stops.
-        sys.exit = MagicMock()
-        QtGui.QMessageBox.question = MagicMock(return_value=QtGui.QMessageBox.Yes)
+        fittingWindow =  FittingWindow(None)
 
-        # Open, then close the main window
-        tmp_main = FittingWindow(None)
-        tmp_main.close()
+        #Test loading from json categories
+        category_list = fittingWindow.master_category_dict.keys()
+        self.assertTrue("Cylinder" in category_list)
+        self.assertTrue("Ellipsoid" in category_list)
+        self.assertTrue("Lamellae" in category_list)
+        self.assertTrue("Paracrystal" in category_list)
+        self.assertTrue("Parallelepiped" in category_list)
+        self.assertTrue("Shape Independent" in category_list)
+        self.assertTrue("Sphere" in category_list)
 
-        # See that the MessageBox method got called
-        self.assertTrue(QtGui.QMessageBox.question.called)
-       
+        #Test for existence in combobox
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Ellipsoid"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Lamellae"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Paracrystal"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Parallelepiped"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Shape Independent"),-1)
+        self.assertNotEqual(fittingWindow.cbCategory.findText("Sphere"),-1)
+
+        #Test what is current text in the combobox
+        self.assertTrue(fittingWindow.cbCategory.currentText(), "Cylinder")
+
+    def testSelectModel(self):
+        """
+        Test if models have been loaded properly
+        :return:
+        """
+        fittingWindow =  FittingWindow(None)
+
+        #Test loading from json categories
+        model_list = fittingWindow.master_category_dict["Cylinder"]
+        self.assertTrue(['cylinder', True] in model_list)
+        self.assertTrue(['core_shell_cylinder', True] in model_list)
+        self.assertTrue(['barbell', True] in model_list)
+        self.assertTrue(['core_shell_bicelle', True] in model_list)
+        self.assertTrue(['flexible_cylinder', True] in model_list)
+        self.assertTrue(['flexible_cylinder_elliptical', True] in model_list)
+        self.assertTrue(['pearl_necklace', True] in model_list)
+        self.assertTrue(['capped_cylinder', True] in model_list)
+        self.assertTrue(['elliptical_cylinder', True] in model_list)
+        self.assertTrue(['pringle', True] in model_list)
+        self.assertTrue(['hollow_cylinder', True] in model_list)
+        self.assertTrue(['core_shell_bicelle_elliptical', True] in model_list)
+        self.assertTrue(['stacked_disks', True] in model_list)
+
+        #Test for existence in combobox
+        self.assertNotEqual(fittingWindow.cbModel.findText("cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("core_shell_cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("barbell"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("core_shell_bicelle"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("flexible_cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("flexible_cylinder_elliptical"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("pearl_necklace"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("capped_cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("elliptical_cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("pringle"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("hollow_cylinder"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("core_shell_bicelle_elliptical"),-1)
+        self.assertNotEqual(fittingWindow.cbModel.findText("stacked_disks"),-1)
+
+
+    def testSelectStructureFactor(self):
+        """
+        Test if structure factors have been loaded properly
+        :return:
+        """
+        fittingWindow =  FittingWindow(None)
+
+        #Test for existence in combobox
+        self.assertNotEqual(fittingWindow.cbStructureFactor.findText("stickyhardsphere"),-1)
+        self.assertNotEqual(fittingWindow.cbStructureFactor.findText("hayter_msa"),-1)
+        self.assertNotEqual(fittingWindow.cbStructureFactor.findText("squarewell"),-1)
+        self.assertNotEqual(fittingWindow.cbStructureFactor.findText("hardsphere"),-1)
+
+        #Test what is current text in the combobox
+        self.assertTrue(fittingWindow.cbCategory.currentText(), "None")
+
 if __name__ == "__main__":
     unittest.main()