Changeset 6548a01 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Jul 20, 2018 4:47:33 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

da046c99

Parents:

200ce9c

Message:

fix FittingPerspectiveTest? after commit 6b75ee (let fit page names start at 1)

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py (modified) (7 diffs)

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

@@ -43 +43 @@
         self.assertEqual(self.widget.optimizer, "Levenberg-Marquardt")
         self.assertEqual(len(self.widget.tabs), 1)
-        self.assertEqual(self.widget.maxIndex, 1)
+        self.assertEqual(self.widget.maxIndex, 2)
         self.assertEqual(self.widget.getTabName(), "FitPage1")
 
@@ -53 +53 @@
         self.assertEqual(len(self.widget.tabs), 2)
         self.assertEqual(self.widget.getTabName(), "FitPage2")
-        self.assertEqual(self.widget.maxIndex, 2)
+        self.assertEqual(self.widget.maxIndex, 3)
         # Add an empty batch tab
         self.widget.addFit(None, is_batch=True)
         self.assertEqual(len(self.widget.tabs), 3)
         self.assertEqual(self.widget.getTabName(2), "BatchPage3")
-        self.assertEqual(self.widget.maxIndex, 3)
+        self.assertEqual(self.widget.maxIndex, 4)
 
     def testAddCSTab(self):
@@ -70 +70 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.getTabName(), "FitPage1")
-        self.assertEqual(self.widget.maxIndex, 1)
+        self.assertEqual(self.widget.maxIndex, 2)
 
         # Attempt to remove the last tab
@@ -78 +78 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.getTabName(), "FitPage2")
-        self.assertEqual(self.widget.maxIndex, 2)
+        self.assertEqual(self.widget.maxIndex, 3)
 
         # Now, add data
@@ -100 +100 @@
         self.widget.tabCloses(1)
         self.assertEqual(len(self.widget.tabs), 1)
-        self.assertEqual(self.widget.maxIndex, 2)
+        self.assertEqual(self.widget.maxIndex, 3)
         self.assertEqual(self.widget.getTabName(), "FitPage2")
 
@@ -107 +107 @@
         # The tab should still be there
         self.assertEqual(len(self.widget.tabs), 1)
-        self.assertEqual(self.widget.maxIndex, 3)
+        self.assertEqual(self.widget.maxIndex, 4)
         self.assertEqual(self.widget.getTabName(), "FitPage3")
 
@@ -166 +166 @@
 
         # Check the names of the new tabs
-        self.assertEqual(self.widget.tabText(1), "BatchPage1")
-        self.assertEqual(self.widget.tabText(2), "BatchPage2")
+        self.assertEqual(self.widget.tabText(1), "BatchPage2")
+        self.assertEqual(self.widget.tabText(2), "BatchPage3")
 
 if __name__ == "__main__":