Changeset 3e8dee3 in sasview for src/sas/qtgui/Utilities

Timestamp:

Nov 8, 2017 9:22:45 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:

0e80658

Parents:

412e069e

Message:

Converted unit tests

Location:

src/sas/qtgui/Utilities

Files:

• GuiUtils.py (modified) (3 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (9 diffs)
• UnitTesting/SasviewLoggerTest.py (modified) (1 diff)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -528 +528 @@
     with open(path,'w') as out:
         has_errors = True
-        if data.dy is None or data.dy == []:
+        if data.dy is None or not data.dy:
             has_errors = False
         # Sanity check
@@ -538 +538 @@
                 has_errors = False
         if has_errors:
-            if data.dx is not None and data.dx != []:
+            if data.dx is not None and data.dx:
                 out.write("<X>   <Y>   <dY>   <dX>\n")
             else:
@@ -547 +547 @@
         for i in range(len(data.x)):
             if has_errors:
-                if data.dx is not None and data.dx != []:
+                if data.dx is not None and data.dx:
                     if  data.dx[i] is not None:
                         out.write("%g  %g  %g  %g\n" % (data.x[i],

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -3 +3 @@
 import webbrowser
 
-from PyQt4 import QtCore
-from PyQt4 import QtGui
+from PyQt5 import QtCore
+from PyQt5 import QtGui, QtWidgets
 from unittest.mock import MagicMock
 
@@ -19 +19 @@
 from sas.qtgui.Utilities.GuiUtils import *
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class GuiUtilsTest(unittest.TestCase):
@@ -90 +90 @@
         # Make sure test_item got all data added
         self.assertEqual(test_item.child(0).text(), name)
-        list_from_item = test_item.child(0).data().toList()
+        list_from_item = test_item.child(0).data()
         self.assertIsInstance(list_from_item, list)
-        self.assertEqual(list_from_item[0].toPyObject(), test_list[0])
-        self.assertEqual(list_from_item[1].toPyObject(), test_list[1])
-        self.assertEqual(list_from_item[2].toPyObject(), test_list[2])
+        self.assertEqual(list_from_item[0], test_list[0])
+        self.assertEqual(list_from_item[1], test_list[1])
+        self.assertEqual(list_from_item[2], test_list[2])
 
     def testupdateModelItemWithPlot(self):
@@ -111 +111 @@
         self.assertEqual(test_item.child(0).text(), name)
         self.assertTrue(test_item.child(0).isCheckable())
-        list_from_item = test_item.child(0).child(0).data().toPyObject()
+        list_from_item = test_item.child(0).child(0).data()
         self.assertIsInstance(list_from_item, list)
         self.assertEqual(str(list_from_item[0]), test_list[0])
@@ -305 +305 @@
         # Test the .txt format
         file_name = "test123_out.txt"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=(file_name,''))
         data.filename = "test123.txt"
         saveData1D(data)
@@ -313 +313 @@
         # Test the .xml format
         file_name = "test123_out.xml"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=(file_name,''))
         data.filename = "test123.xml"
         saveData1D(data)
@@ -321 +321 @@
         # Test the wrong format
         file_name = "test123_out.mp3"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=(file_name,''))
         data.filename = "test123.mp3"
         saveData1D(data)
@@ -337 +337 @@
         # Test the .txt format
         file_name = "test123_out.dat"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=(file_name,''))
         data.filename = "test123.dat"
         saveData2D(data)
@@ -345 +345 @@
         # Test the wrong format
         file_name = "test123_out.mp3"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=(file_name,''))
         data.filename = "test123.mp3"
         saveData2D(data)

src/sas/qtgui/Utilities/UnitTesting/SasviewLoggerTest.py

@@ -3 +3 @@
 import logging
 
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt5.QtGui import *
+from PyQt5.QtCore import *
+from PyQt5.QtWidgets import *
 
 # set up import paths