Changeset c02721c4 in sasview

Timestamp:

Mar 29, 2019 8:36:51 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_opencl

Children:

6edd344

Parents:

c7e73e7

Message:

Unit test update after latest round of commits.

Location:

src/sas/qtgui

Files:

• Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (5 diffs)
• Calculators/UnitTesting/SLDCalculatorTest.py (modified) (1 diff)
• MainWindow/UnitTesting/DataExplorerTest.py (modified) (2 diffs)
• MainWindow/UnitTesting/GuiManagerTest.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)
• Utilities/UnitTesting/TabbedModelEditorTest.py (modified) (1 diff)

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -186 +186 @@
         # wait a bit for data to be loaded
         time.sleep(0.1)
+        QtWidgets.qApp.processEvents()
+
         # check updated values in ui, read from loaded file
         self.assertEqual(self.widget.txtData.text(), 'sld_file.sld')
@@ -250 +252 @@
 
         time.sleep(1)
+        QtWidgets.qApp.processEvents()
+
         # check updated values in ui, read from loaded file
         # TODO to be changed
@@ -310 +314 @@
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
         time.sleep(2)
+        QtWidgets.qApp.processEvents()
 
         self.assertEqual(self.widget.txtData.text(), 'A_Raw_Example-1.omf')
@@ -396 +401 @@
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
         time.sleep(1)
+        QtWidgets.qApp.processEvents()
 
         self.assertTrue(self.widget.cmdDraw.isEnabled())
@@ -417 +423 @@
 
         time.sleep(0.1)
+        QtWidgets.qApp.processEvents()
 
         filename1 = "test"
         QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=[filename1, ''])
 
-        QTest.mouseClick(self.widget.cmdSave, Qt.LeftButton)
+        #QTest.mouseClick(self.widget.cmdSave, Qt.LeftButton)
         self.widget.onSaveFile()
+        QtWidgets.qApp.processEvents()
+
         self.assertTrue(os.path.isfile(filename1 + '.sld'))
         self.assertTrue(os.path.getsize(filename1 + '.sld') > 0)

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -128 +128 @@
 
         # Assure the mass density field is set
-        #self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '43.4')
         self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '2.89')
-
-        # Reset the widget
-        self.widget.modelReset()
-       
-        self.assertEqual(self.widget.ui.editMolecularFormula.text(), "H2O")
-        self.assertEqual(self.widget.ui.editMassDensity.text(), "1")
-        self.assertEqual(self.widget.ui.editWavelength.text(), "6")
 
     def testHelp(self):

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -740 +740 @@
                                 caption="Save As",
                                 directory='cyl_400_20_out.txt',
-                                filter='Text files (*.txt);;CanSAS 1D files(*.xml)',
+                                filter='Text files (*.txt);;CanSAS 1D files(*.xml);;NXcanSAS files (*.h5)',
                                 parent=None)
         QFileDialog.getSaveFileName.assert_called_once()
@@ -763 +763 @@
                                 caption="Save As",
                                 directory='P123_D2O_10_percent_out.dat',
-                                filter='IGOR/DAT 2D file in Q_map (*.dat)',
+                                filter='IGOR/DAT 2D file in Q_map (*.dat);;NXcanSAS files (*.h5)',
                                 parent=None)
         QFileDialog.getSaveFileName.assert_called_once()

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -147 +147 @@
         """
         self.manager.processVersion = MagicMock()
-        version = {'version'     : '4.2.0',
+        version = {'version'     : '4.2.1',
                    'update_url'  : 'http://www.sasview.org/sasview.latestversion', 
                    'download_url': 'https://github.com/SasView/sasview/releases'}

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

@@ -242 +242 @@
         self.widget.show()
         # Change the category index so we have some models
-        category_index = self.widget.cbCategory.findText("Shape Independent")
+        category_index = self.widget.cbCategory.findText("Cylinder")
         self.widget.cbCategory.setCurrentIndex(category_index)
         # Change the model to one that supports structure factors
-        model_index = self.widget.cbModel.findText('fractal_core_shell')
+        model_index = self.widget.cbModel.findText('cylinder')
         self.widget.cbModel.setCurrentIndex(model_index)
 
@@ -260 +260 @@
         self.widget.cbStructureFactor.setCurrentIndex(structure_index)
 
-        # We have 3 more param rows now (radius_effective is removed), and a new heading
-        self.assertEqual(self.widget._model_model.rowCount(), rowcount+4)
+        # We have 3 more param rows now (radius_effective is removed), and new headings
+        self.assertEqual(self.widget._model_model.rowCount(), rowcount+7)
 
         # Switch models

src/sas/qtgui/Utilities/UnitTesting/TabbedModelEditorTest.py

@@ -204 +204 @@
         self.widget.editor_widget.txtEditor.toPlainText = MagicMock(return_value=boring_text)
         self.widget.writeFile = MagicMock()
+        self.widget.plugin_widget.is_python = MagicMock()
         #invoke the method
         self.widget.updateFromEditor()