Changeset baeac95 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

Nov 14, 2018 5:43:28 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

ecc5d043

Parents:

e5ae812

Message:

Added Edit to single page constraint SASVIEW-1043

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)

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

@@ -185 +185 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
-        self.assertEqual(self.widget.cbModel.count(), 29)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 7)
+        self.assertEqual(self.widget.cbModel.count(), 30)
 
         # Set the structure factor
@@ -219 +219 @@
         # 
         # Now change the model
-<<<<<<< HEAD
         self.widget.cbModel.setCurrentIndex(4)
-=======
-        self.widget.cbModel.setCurrentIndex(2)
->>>>>>> ESS_GUI
         self.assertEqual(self.widget.cbModel.currentText(),'dab')