Changeset 99ea1b0 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Oct 27, 2017 8:49:35 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:

0849aec

Parents:

895e7359

Message:

Update for unit tests and minor functionality quirks

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (4 diffs, 1 prop)
• UnitTesting/AboutBoxTest.py (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (5 diffs, 1 prop)
• UnitTesting/GuiManagerTest.py (modified) (5 diffs, 1 prop)
• UnitTesting/MainWindowTest.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -175 +175 @@
         load_thread = threads.deferToThread(self.readData, url)
         load_thread.addCallback(self.loadComplete)
+        load_thread.addErrback(self.loadFailed)
 
     def loadFile(self, event=None):
@@ -221 +222 @@
             load_thread = threads.deferToThread(self.readProject, filename)
             load_thread.addCallback(self.readProjectComplete)
+            load_thread.addErrback(self.readProjectFailed)
+
+    def readProjectFailed(self, reason):
+        """
+        """
+        print("readProjectFailed FAILED: ", reason)
+        pass
 
     def readProject(self, filename):
@@ -614 +622 @@
             return
 
-        #if isinstance(paths, QtCore.QStringList):
-        #    paths = [str(f) for f in paths]
-
         if not isinstance(paths, list):
             paths = [paths]
@@ -992 +997 @@
         self.manager.add_data(data_list=output_data)
 
+    def loadErrback(self, reason):
+        print("File Load Failed with:\n", reason)
+        pass
+
     def updateModel(self, data, p_file):
         """

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

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

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

@@ -5 +5 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import *
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 from mpl_toolkits.mplot3d import Axes3D
 
@@ -157 +157 @@
 
         expected_list = [0, 0, 33, 66, -1]
-        spied_list = [spy_progress_bar_update.called()[i]['args'][0] for i in xrange(5)]
+        spied_list = [spy_progress_bar_update.called()[i]['args'][0] for i in range(5)]
         self.assertEqual(expected_list, spied_list)
         
@@ -173 +173 @@
         filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"]
         self.form.readData(filename)
-
-        self.form.show()
-        app.exec_()
 
         # Assure the model contains three items
@@ -329 +326 @@
         self.form.cbSelect.setCurrentIndex(1)
 
+        self.form.show()
+        app.exec_()
+
         # Test the current selection
         item1D = self.form.model.item(0)
@@ -507 +507 @@
         # We don't know the data ID, so need to iterate over dict
         data_dict = spy_data_received.called()[0]['args'][0]
-        for data_key, data_value in data_dict.iteritems():
+        for data_key, data_value in data_dict.items():
             self.assertIsInstance(data_value, Data1D)
 

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

@@ -9 +9 @@
 from PyQt4.QtCore import *
 from PyQt4.QtWebKit import *
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths
@@ -74 +74 @@
         # We are in the MainWindow scope, so simple 'print' will work
         message = "from stdout"
-        print message
+        print(message)
         self.assertIn(message, self.manager.logDockWidget.widget().toPlainText())
 
@@ -162 +162 @@
         """
         # 1. version = 0.0.0
-        version_info = {u'version' : u'0.0.0'}
+        version_info = {'version' : '0.0.0'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
 
@@ -172 +172 @@
 
         # 2. version < LocalConfig.__version__
-        version_info = {u'version' : u'0.0.1'}
+        version_info = {'version' : '0.0.1'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
 
@@ -182 +182 @@
 
         # 3. version > LocalConfig.__version__
-        version_info = {u'version' : u'999.0.0'}
+        version_info = {'version' : '999.0.0'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
         webbrowser.open = MagicMock()

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

@@ -5 +5 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths