Changeset 9ce69ec in sasview for src/sas/qtgui/Calculators

Timestamp:

Sep 18, 2018 3:51:44 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

fc5d2d7f

Parents:

1738173

git-author:

Piotr Rozyczko <rozyczko@…> (09/18/18 03:42:03)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/18/18 03:51:44)

Message:

Replaced 'smart' plot generation with explicit plot requests on "Show Plot". SASVIEW-1018

File:

• src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py (modified) (3 diffs)

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

@@ -81 +81 @@
         self.assertEqual(self.widget.ui.editMolecularFormula.styleSheet(), '')
         self.assertEqual(self.widget.model.columnCount(), 1)
-        self.assertEqual(self.widget.model.rowCount(), 12)
+        self.assertEqual(self.widget.model.rowCount(), 11)
         self.assertEqual(self.widget.sizePolicy().Policy(), QtWidgets.QSizePolicy.Fixed)
 
     def testSimpleEntry(self):
         ''' Default compound calculations '''
-
-        self.widget.show()
 
         self.widget.ui.editMassDensity.clear()
@@ -102 +100 @@
 
         # Change mass density
-        self.widget.ui.editWavelength.clear()
-        self.widget.ui.editWavelength.setText("666.0")
+        self.widget.ui.editNeutronWavelength.clear()
+        self.widget.ui.editNeutronWavelength.setText("666.0")
 
         # Send shift-tab to update the molar volume field
@@ -130 +128 @@
 
         # Assure the mass density field is set
-        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '43.4')
+        #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")