Changeset 2155824 in sasview

Timestamp:

Apr 6, 2017 5:58:54 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d7ff531

Parents:

454670d

Message:

Updated/fixed unit tests after recent functionality changes

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py (modified) (2 diffs)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (1 diff)
• UnitTesting/GuiManagerTest.py (modified) (1 diff)

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

@@ -104 +104 @@
                         data, False, None)
 
-        new_plot = self.logic.new1DPlot(return_data=return_data)
+        new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)
 
         self.assertIsInstance(new_plot, Data1D)

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

@@ -91 +91 @@
         self.widget.setData([item])
 
-        # Look at the data in tab
-        self.assertEqual(self.widget._model_item, item)
-
         # First tab should accept data
         self.assertEqual(len(self.widget.tabs), 1)
@@ -103 +100 @@
         self.assertEqual(len(self.widget.tabs), 2)
 
+        # Add two more items in a list
+        self.widget.setData([item, item])
+
+        # Check for 4 tabs
+        self.assertEqual(len(self.widget.tabs), 4)
+
 
 if __name__ == "__main__":

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

@@ -73 +73 @@
         item = QtGui.QStandardItem("test")
 
-        widget_with_data = FittingWidget(dummy_manager(), data=[item], id=3)
+        widget_with_data = FittingWidget(dummy_manager(), data=item, id=3)
 
         self.assertEqual(widget_with_data.data, data)

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -418 +418 @@
 
         # Expected two status bar updates
-        self.assertEqual(spy_status_update.count(), 1)
+        self.assertEqual(spy_status_update.count(), 2)
         self.assertIn(filename[0], str(spy_status_update.called()[0]['args'][0]))
 

src/sas/qtgui/UnitTesting/GuiManagerTest.py

@@ -148 +148 @@
         self.manager.processVersion = MagicMock()
         version = {'update_url'  : 'http://www.sasview.org/sasview.latestversion', 
-                   'version'     : '4.0.1',
+                   'version'     : '4.1.0',
                    'download_url': 'https://github.com/SasView/sasview/releases'}
         self.manager.checkUpdate()