Changeset 53c771e in sasview for src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

Timestamp:

Nov 9, 2017 6:45:20 AM (6 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:

dd150ef

Parents:

d6b8a1d

git-author:

Piotr Rozyczko <rozyczko@…> (11/08/17 07:22:45)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:45:20)

Message:

Converted unit tests

File:

• src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py (modified) (6 diffs)

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from PyQt4 import QtGui
-from PyQt4.QtTest import QTest
-from PyQt4.QtCore import Qt
+import logging
+
+from PyQt5 import QtGui, QtWidgets
+from PyQt5.QtTest import QTest
+from PyQt5.QtCore import Qt
 from unittest.mock import MagicMock
 
@@ -12 +14 @@
 from sas.sascalc.dataloader.loader import Loader
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 
@@ -29 +31 @@
     def testDefaults(self):
         """Test the GUI in its default state"""
-        self.assertIsInstance(self.widget, QtGui.QWidget)
+        self.assertIsInstance(self.widget, QtWidgets.QWidget)
         self.assertEqual(self.widget.windowTitle(), "Slit Size Calculator")
-        self.assertEqual(self.widget.sizePolicy().Policy(), QtGui.QSizePolicy.Fixed)
+        self.assertEqual(self.widget.sizePolicy().Policy(), QtWidgets.QSizePolicy.Fixed)
 
     def testHelp(self):
@@ -45 +47 @@
 
         # Return no files.
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=None)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=('',''))
 
         # Click on the Browse button
@@ -51 +53 @@
 
         # Test the getOpenFileName() dialog called once
-        self.assertTrue(QtGui.QFileDialog.getOpenFileName.called)
-        QtGui.QFileDialog.getOpenFileName.assert_called_once()
+        self.assertTrue(QtWidgets.QFileDialog.getOpenFileName.called)
+        QtWidgets.QFileDialog.getOpenFileName.assert_called_once()
 
         # Now, return a single file
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=(filename,''))
 
         # Click on the Load button
         QTest.mouseClick(browseButton, Qt.LeftButton)
-        QtGui.qApp.processEvents()
+        QtWidgets.qApp.processEvents()
 
         # Test the getOpenFileName() dialog called once
-        self.assertTrue(QtGui.QFileDialog.getOpenFileName.called)
-        QtGui.QFileDialog.getOpenFileName.assert_called_once()
+        self.assertTrue(QtWidgets.QFileDialog.getOpenFileName.called)
+        QtWidgets.QFileDialog.getOpenFileName.assert_called_once()
 
 
@@ -81 +83 @@
         """ Test on wrong input data """
 
-        filename = "P123_D2O_10_percent.dat"
+        filename = "Dec07031.ASC"
         loader = Loader()
         data = loader.load(filename)[0]
-        self.assertRaisesRegex(RuntimeError,
-                                "Slit Length cannot be computed for 2D Data",
-                                self.widget.calculateSlitSize, data)
+
+        logging.error = MagicMock()
+
+        self.widget.calculateSlitSize(data)
+
+        self.assertTrue(logging.error.called_once())
 
         data = None
-        self.assertRaisesRegex(RuntimeError,
-                                "ERROR: Data hasn't been loaded correctly",
-                                self.widget.calculateSlitSize, data)
+        self.widget.calculateSlitSize(data)
+        self.assertTrue(logging.error.call_count == 2)