Changeset c02721c4 in sasview for src/sas/qtgui/Calculators

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/Calculators/UnitTesting

Files:

• GenericScatteringCalculatorTest.py (modified) (5 diffs)
• SLDCalculatorTest.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):