Changeset e540cd2 in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Jul 7, 2016 4:54:18 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

0cd8612

Parents:

f0f309d

Message:

Status bar, progress bar, initial treeview context menu + minor cleanup

Location:

src/sas/qtgui/UnitTesting

Files:

• AboutBoxTest.py (modified) (1 diff)
• DataExplorerTest.py (modified) (4 diffs)
• DroppableDataLoadWidgetTest.py (modified) (4 diffs)
• GuiManagerTest.py (modified) (6 diffs)
• GuiUtilsTest.py (modified) (3 diffs)

src/sas/qtgui/UnitTesting/AboutBoxTest.py

@@ -76 +76 @@
                 LocalConfig._ill_url,
                 LocalConfig._inst_url]
-        
+
         # Press the buttons
         buttonList = self.widget.findChildren(QPushButton)

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -92 +92 @@
         self.assertIsInstance(self.form.freezeView, QTreeView)
 
-        
+    def testWidgets(self):
+        """
+        Test if all required widgets got added
+        """        
     def testLoadButton(self):
         loadButton = self.form.cmdLoad
@@ -111 +114 @@
 
         # Make sure the signal has not been emitted
-        #self.assertEqual(spy_file_read.count(), 0)
+        self.assertEqual(spy_file_read.count(), 0)
 
         # Now, return a single file
         QtGui.QFileDialog.getOpenFileNames = MagicMock(return_value=filename)
-        
+
         # Click on the Load button
         QTest.mouseClick(loadButton, Qt.LeftButton)
+        QtGui.qApp.processEvents()
 
         # Test the getOpenFileName() dialog called once
@@ -127 +131 @@
         #self.assertIn(filename, str(spy_file_read.called()[0]['args'][0]))
 
+    def testLoadFiles(self):
+        """
+        Test progress bar update while loading of multiple files
+        """
+        # Set up the spy on progress bar update signal
+        spy_progress_bar_update = QtSignalSpy(self.form,
+            self.form.communicator.progressBarUpdateSignal)
+
+        # Populate the model
+        filename = ["cyl_400_20.txt", "Dec07031.ASC", "cyl_400_20.txt"]
+        self.form.readData(filename)
+
+        # 0, 0, 33, 66, -1 -> 5 signals reaching progressBar
+        self.assertEqual(spy_progress_bar_update.count(), 5)
+
+        expected_list = [0, 0, 33, 66, -1]
+        spied_list = [spy_progress_bar_update.called()[i]['args'][0] for i in xrange(5)]
+        self.assertEqual(expected_list, spied_list)
+        
     def testDeleteButton(self):
         """
@@ -441 +464 @@
         default_list = defaults.split(';;')
 
-        for format in default_list:
-            self.assertIn(format, w_list)
+        for def_format in default_list:
+            self.assertIn(def_format, w_list)
        
     def testLoadComplete(self):

src/sas/qtgui/UnitTesting/DroppableDataLoadWidgetTest.py

@@ -4 +4 @@
 from PyQt4.QtGui import QApplication
 from PyQt4.QtTest import QTest
-from PyQt4.QtCore import Qt
+from PyQt4 import QtCore
 from DroppableDataLoadWidget import DroppableDataLoadWidget
 from GuiUtils import *
+from UnitTesting.TestUtils import QtSignalSpy
 
 app = QApplication(sys.argv)
@@ -21 +22 @@
 
         self.form = DroppableDataLoadWidget(None, guimanager=dummy_manager())
-        # create dummy mime objects
+
+        # create dummy mime object
+        self.mime_data = QtCore.QMimeData()
+        self.testfile = 'testfile.txt'
+        self.mime_data.setUrls([QtCore.QUrl(self.testfile)])
 
     def testDragIsOK(self):
@@ -27 +32 @@
         Test the item being dragged over the load widget
         """
-        pass
+        good_drag_event = QtGui.QDragMoveEvent(QtCore.QPoint(0,0),
+                                               QtCore.Qt.CopyAction,
+                                               self.mime_data,
+                                               QtCore.Qt.LeftButton,
+                                               QtCore.Qt.NoModifier)
+        mime_data = QtCore.QMimeData()
+        bad_drag_event = QtGui.QDragMoveEvent(QtCore.QPoint(0,0),
+                                               QtCore.Qt.CopyAction,
+                                               mime_data,
+                                               QtCore.Qt.LeftButton,
+                                               QtCore.Qt.NoModifier)
+
+        # Call the drag handler with good event
+        self.assertTrue(self.form.dragIsOK(good_drag_event))
+
+        # Call the drag handler with bad event
+        self.assertFalse(self.form.dragIsOK(bad_drag_event))
 
     def testDropEvent(self):
@@ -33 +54 @@
         Test what happens if an object is dropped onto the load widget
         """
-        pass
+        spy_file_read = QtSignalSpy(self.form, self.form.communicator.fileReadSignal)
+
+        drop_event = QtGui.QDropEvent(QtCore.QPoint(0,0),
+                                           QtCore.Qt.CopyAction,
+                                           self.mime_data,
+                                           QtCore.Qt.LeftButton,
+                                           QtCore.Qt.NoModifier)
+
+        self.form.dropEvent(drop_event)
+        QtGui.qApp.processEvents()
+        self.assertEqual(spy_file_read.count(), 1)
+        self.assertIn(self.testfile, str(spy_file_read.signal(index=0)))
+
 
 if __name__ == "__main__":

src/sas/qtgui/UnitTesting/GuiManagerTest.py

@@ -12 +12 @@
 
 # Local
+from DataExplorer import DataExplorerWindow
+from UI.AcknowledgementsUI import Acknowledgements
+from AboutBox import AboutBox
+from WelcomePanel import WelcomePanel
+
 from GuiManager import GuiManager
 from UI.MainWindowUI import MainWindow
@@ -38 +43 @@
 
     def testDefaults(self):
-        '''Test the object in its default state'''
-        pass
-        
+        """
+        Test the object in its default state
+        """
+        self.assertIsInstance(self.manager.filesWidget, DataExplorerWindow)
+        self.assertIsInstance(self.manager.dockedFilesWidget, QDockWidget)
+        self.assertEqual(self.manager.dockedFilesWidget.features(), QDockWidget.NoDockWidgetFeatures)
+        self.assertEqual(self.manager._workspace.dockWidgetArea(self.manager.dockedFilesWidget), Qt.LeftDockWidgetArea)
+        self.assertIsInstance(self.manager.ackWidget, Acknowledgements)
+        self.assertIsInstance(self.manager.aboutWidget, AboutBox)
+        self.assertIsInstance(self.manager.welcomePanel, WelcomePanel)
+
     def testUpdatePerspective(self):
         """
@@ -76 +89 @@
         # See that the MessageBox method got called
         self.assertTrue(QMessageBox.question.called)
-        # sys.exit() not called this time
-        self.assertFalse(sys.exit.called)
 
         # Say Yes to the close dialog
@@ -139 +150 @@
         webbrowser.open.assert_called_with("https://github.com/SasView/sasview/releases")
 
-        ## 4. version > LocalConfig.__version__ and standalone
-        #version_info = {u'version' : u'999.0.0'}
-        #spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
-        #webbrowser.open = MagicMock()
-
-        #self.manager.processVersion(version_info, standalone=True)
-
-        #self.assertEqual(spy_status_update.count(), 1)
-        #message = 'See the help menu to download it'
-        #self.assertIn(message, str(spy_status_update.signal(index=0)))
-
-        #self.assertFalse(webbrowser.open.called)
-
-        # 5. couldn't load version
+        # 4. couldn't load version
         version_info = {}
         logging.error = MagicMock()
@@ -173 +171 @@
         pass
 
+    #### FILE ####
     def testActionLoadData(self):
         """
@@ -185 +184 @@
         # Test the getOpenFileName() dialog called once
         self.assertTrue(QFileDialog.getOpenFileNames.called)
-        
+
+    def testActionLoadDataFolder(self):
+        """
+        Menu File/Load Data Folder
+        """
+        # Mock the system file open method
+        QFileDialog.getExistingDirectory = MagicMock(return_value=None)
+
+        # invoke the action
+        self.manager.actionLoad_Data_Folder()
+
+        # Test the getOpenFileName() dialog called once
+        self.assertTrue(QFileDialog.getExistingDirectory.called)
+
+    #### VIEW ####
+    def testActionHideToolbar(self):
+        """
+        Menu View/Hide Toolbar
+        """
+        # Need to display the main window to initialize the toolbar.
+        self.manager._workspace.show()
+
+        # Check the initial state
+        self.assertTrue(self.manager._workspace.toolBar.isVisible())
+        self.assertEqual('Hide Toolbar', self.manager._workspace.actionHide_Toolbar.text())
+
+        # Invoke action
+        self.manager.actionHide_Toolbar()
+
+        # Assure changes propagated correctly
+        self.assertFalse(self.manager._workspace.toolBar.isVisible())
+        self.assertEqual('Show Toolbar', self.manager._workspace.actionHide_Toolbar.text())
+
+        # Revert
+        self.manager.actionHide_Toolbar()
+
+        # Assure the original values are back
+        self.assertTrue(self.manager._workspace.toolBar.isVisible())
+        self.assertEqual('Hide Toolbar', self.manager._workspace.actionHide_Toolbar.text())
+
+
+    #### HELP ####
     def testActionDocumentation(self):
         """

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -2 +2 @@
 import unittest
 import webbrowser
-import urlparse
 
 from PyQt4 import QtCore
@@ -59 +58 @@
             'updatePerspectiveWithDataSignal',
             'updateModelFromPerspectiveSignal',
-            'plotRequestedSignal'
+            'plotRequestedSignal',
+            'progressBarUpdateSignal',
         ]
 
@@ -188 +188 @@
         with self.assertRaises(AttributeError):
             openLink(bad_url3)
-        pass
 
 if __name__ == "__main__":