Changeset 2327399 in sasview for src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

Timestamp:

Dec 4, 2018 9:22:17 AM (5 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

3801429

Parents:

a8e6394 (diff), 0989bad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (7 diffs)

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

@@ -331 +331 @@
         time.sleep(1)
         # Unselect all data
-        self.form.cbSelect.setCurrentIndex(1)
-
+        self.form.cbSelect.activated.emit(1)
         # Test the current selection
         item1D = self.form.model.item(0)
@@ -341 +340 @@
 
         # Select all data
-        self.form.cbSelect.setCurrentIndex(0)
+        self.form.cbSelect.activated.emit(0)
 
         # Test the current selection
@@ -348 +347 @@
 
         # select 1d data
-        self.form.cbSelect.setCurrentIndex(2)
-
+        self.form.cbSelect.activated.emit(2)
         # Test the current selection
         self.assertTrue(item1D.checkState() == Qt.Checked)
@@ -355 +353 @@
 
         # unselect 1d data
-        self.form.cbSelect.setCurrentIndex(3)
+        self.form.cbSelect.activated.emit(3)
 
         # Test the current selection
@@ -362 +360 @@
 
         # select 2d data
-        self.form.cbSelect.setCurrentIndex(4)
+        self.form.cbSelect.activated.emit(4)
 
         # Test the current selection
@@ -369 +367 @@
 
         # unselect 2d data
-        self.form.cbSelect.setCurrentIndex(5)
+        self.form.cbSelect.activated.emit(5)
 
         # Test the current selection
         self.assertTrue(item1D.checkState() == Qt.Unchecked)
         self.assertTrue(item2D.checkState() == Qt.Unchecked)        
-
-        # choose impossible index and assure the code raises
-        #with self.assertRaises(Exception):
-        #    self.form.cbSelect.setCurrentIndex(6)
 
     def testFreezeTheory(self):
@@ -581 +575 @@
 
         # Call the plotting method
-        self.form.newPlot()
-
-        QApplication.processEvents()
+        #self.form.newPlot()
+        #QApplication.processEvents()
 
         # The plot was registered
-        self.assertEqual(len(PlotHelper.currentPlots()), 1)
-
-        self.assertTrue(self.form.cbgraph.isEnabled())
-        self.assertTrue(self.form.cmdAppend.isEnabled())
+        #self.assertEqual(len(PlotHelper.currentPlots()), 1)
+
+        #self.assertTrue(self.form.cbgraph.isEnabled())
+        #self.assertTrue(self.form.cmdAppend.isEnabled())
 
     @patch('sas.qtgui.Utilities.GuiUtils.plotsFromCheckedItems')