Run unit tests of Qt GUI and have CI gate on them

.github/workflows/test.yml

@@ -54,7 +54,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install wheel setuptools
-        python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5 html2text importlib_resources
+        python -m pip install numpy scipy matplotlib docutils pytest pytest_qt pytest-mock sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5 html2text importlib_resources uncertainties dominate html2text
 
     - name: Install pyopencl (Linux + macOS)
       if: ${{ matrix.os != 'windows-latest' }}
@@ -124,5 +124,8 @@ jobs:
       env:
         PYOPENCL_COMPILER_OUTPUT: 1
       run: |
-        cd src/sas/qtgui
-        xvfb-run -a --server-args="-screen 0 1024x768x24" python GUITests.py || true
+        # Suppress SIGSEGV from the tests until they can be fixed
+        retval=0
+        xvfb-run -a --server-args="-screen 0 1024x768x24" python -m pytest -rsx -v src/sas/qtgui/ || retval=$?
+        if [ $retval -eq 139 ]; then echo "WARNING: Python interpreter exited with Segmentation Fault. This normally indicates that Qt objects were not correctly deleted. This error is currently suppressed in SasView's test suite."; retval=0; fi
+        exit $retval

build_tools/requirements.txt

@@ -1,7 +1,9 @@
 numpy 
 scipy==1.7.3 
 docutils 
-pytest<6 
+pytest
+pytest_qt
+pyteset-mock
 unittest-xml-reporting
 tinycc 
 h5py 

pytest.ini

@@ -1,4 +1,6 @@
-[pytest]
-norecursedirs=test/sasrealspace test/calculatorview
-addopts=--ignore test/utest_sasview.py
-python_files='u*py'
+[pytest]
+norecursedirs=test/sasrealspace test/calculatorview UnitTesting/SquishTestSuites
+addopts=--ignore test/utest_sasview.py
+python_files='u*py' '*Test*py'
+python_classes = *Test Test*
+qt_api=pyqt5

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -96,7 +96,7 @@ def updateCombobox(self, filenames):
 
                 else:
                     # filenames without titles by removing time.time()
-                    new_title = re.sub('\d{10}\.\d{2}', '', str(key_id))
+                    new_title = re.sub(r'\d{10}\.\d{2}', '', str(key_id))
                     self.list_data_items.append(new_title)
                     list_datafiles.append(new_title)
 
@@ -154,6 +154,8 @@ def onCompute(self):
         # Add the new plot to the comboboxes
         self.cbData1.addItem(self.output.name)
         self.cbData2.addItem(self.output.name)
+        if self.filenames is None:
+            self.filenames = {}
         self.filenames[self.output.name] = self.output
 
     def onPrepareOutputData(self):
@@ -367,10 +369,10 @@ def _findId(self, name):
     def _extractData(self, key_id):
         """ Extract data from file with id contained in list of filenames """
         data_complete = self.filenames[key_id]
-        dimension = data_complete.__class__.__name__
+        dimension = data_complete.data.__class__.__name__
 
         if dimension in ('Data1D', 'Data2D'):
-            return copy.deepcopy(data_complete)
+            return copy.deepcopy(data_complete.data)
 
         else:
             logging.error('Error with data format')

src/sas/qtgui/Calculators/DensityPanel.py

@@ -127,6 +127,8 @@ def volumeChanged(self, current_text):
             molarDensity = molarMass / molarVolume
             molarDensity = formatNumber(molarDensity, high=True)
             self.model.item(MODEL.MASS_DENSITY).setText(str(molarDensity))
+            # be sure to store the new value in the model
+            self.model.item(MODEL.MOLAR_VOLUME).setText(current_text)
 
         except (ArithmeticError, ValueError):
             self.model.item(MODEL.MASS_DENSITY).setText("")
@@ -139,6 +141,8 @@ def massChanged(self, current_text):
             molarVolume = molarMass / molarDensity
             molarVolume = formatNumber(molarVolume, high=True)
             self.model.item(MODEL.MOLAR_VOLUME).setText(str(molarVolume))
+            # be sure to store the new value in the model
+            self.model.item(MODEL.MASS_DENSITY).setText(current_text)
 
         except (ArithmeticError, ValueError):
             self.model.item(MODEL.MOLAR_VOLUME).setText("")

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -157,7 +157,7 @@ def __init__(self, parent=None):
 
         # validators
         # scale, volume and background must be positive
-        validat_regex_pos = QtCore.QRegExp('^[+]?([.]\d+|\d+([.]\d+)?)$')
+        validat_regex_pos = QtCore.QRegExp(r'^[+]?([.]\d+|\d+([.]\d+)?)$')
         self.txtScale.setValidator(QtGui.QRegExpValidator(validat_regex_pos,
                                                           self.txtScale))
         self.txtBackground.setValidator(QtGui.QRegExpValidator(
@@ -166,14 +166,14 @@ def __init__(self, parent=None):
             validat_regex_pos, self.txtTotalVolume))
 
         # fraction of spin up between 0 and 1
-        validat_regexbetween0_1 = QtCore.QRegExp('^(0(\.\d*)*|1(\.0+)?)$')
+        validat_regexbetween0_1 = QtCore.QRegExp(r'^(0(\.\d*)*|1(\.0+)?)$')
         self.txtUpFracIn.setValidator(
             QtGui.QRegExpValidator(validat_regexbetween0_1, self.txtUpFracIn))
         self.txtUpFracOut.setValidator(
             QtGui.QRegExpValidator(validat_regexbetween0_1, self.txtUpFracOut))
 
         # angles, SLD must be float values
-        validat_regex_float = QtCore.QRegExp('^[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?$')
+        validat_regex_float = QtCore.QRegExp(r'^[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?$')
         self.txtUpTheta.setValidator(
             QtGui.QRegExpValidator(validat_regex_float, self.txtUpTheta))
         self.txtUpPhi.setValidator(
@@ -212,12 +212,12 @@ def __init__(self, parent=None):
             QtGui.QRegExpValidator(validat_regex_float, self.txtSampleRoll))   
 
         # 0 < Qmax <= 1000
-        validat_regex_q = QtCore.QRegExp('^1000$|^[+]?(\d{1,3}([.]\d+)?)$')
+        validat_regex_q = QtCore.QRegExp(r'^1000$|^[+]?(\d{1,3}([.]\d+)?)$')
         self.txtQxMax.setValidator(QtGui.QRegExpValidator(validat_regex_q,
                                                           self.txtQxMax))
 
         # 2 <= Qbin and nodes integers < 1000
-        validat_regex_int = QtCore.QRegExp('^[2-9]|[1-9]\d{1,2}$')        
+        validat_regex_int = QtCore.QRegExp(r'^[2-9]|[1-9]\d{1,2}$')
         self.txtNoQBins.setValidator(QtGui.QRegExpValidator(validat_regex_int,
                                                             self.txtNoQBins))
 
@@ -264,11 +264,14 @@ def setup_display(self):
         self.view_elev = 45
         self.mouse_down = False
         sampleWindow = FigureCanvas(Figure())
-        axes_sample = Axes3D(sampleWindow.figure, azim=self.view_azim, elev=self.view_elev)
+        axes_sample = Axes3D(sampleWindow.figure, azim=self.view_azim, elev=self.view_elev, auto_add_to_figure=False)
+        sampleWindow.figure.add_axes(axes_sample)
         envWindow = FigureCanvas(Figure())
-        axes_env = Axes3D(envWindow.figure, azim=self.view_azim, elev=self.view_elev)
+        axes_env = Axes3D(envWindow.figure, azim=self.view_azim, elev=self.view_elev, auto_add_to_figure=False)
+        envWindow.figure.add_axes(axes_env)
         beamWindow = FigureCanvas(Figure())
-        axes_beam = Axes3D(beamWindow.figure, azim=self.view_azim, elev=self.view_elev)
+        axes_beam = Axes3D(beamWindow.figure, azim=self.view_azim, elev=self.view_elev, auto_add_to_figure=False)
+        beamWindow.figure.add_axes(axes_beam)
         self.coord_windows = [sampleWindow, envWindow, beamWindow]
         self.coord_axes = [axes_sample, axes_env, axes_beam]
         self.coord_arrows = []
@@ -1428,8 +1431,8 @@ def plot_1_2d(self):
             data = Data1D(x=self.data.x, y=self.data_to_plot)
             data.title = "GenSAS {}  #{} 1D".format(self.file_name(),
                                                     int(self.graph_num))
-            data.xaxis('\\rm{Q_{x}}', '\AA^{-1}')
-            data.yaxis('\\rm{Intensity}', 'cm^{-1}')
+            data.xaxis(r'\rm{Q_{x}}', r'\AA^{-1}')
+            data.yaxis(r'\rm{Intensity}', 'cm^{-1}')
 
             self.graph_num += 1
         else:
@@ -1518,10 +1521,11 @@ def showPlot(self, data, has_arrow=False):
 
         self.figure.clear()
         self.figure.subplots_adjust(left=0.1, right=.8, bottom=.1)
-        ax = Axes3D(self.figure)
-        ax.set_xlabel('x ($\A{}$)'.format(data.pos_unit))
-        ax.set_ylabel('z ($\A{}$)'.format(data.pos_unit))
-        ax.set_zlabel('y ($\A{}$)'.format(data.pos_unit))
+        ax = Axes3D(self.figure, auto_add_to_figure=False)
+        self.figure.add_axes(ax)
+        ax.set_xlabel(r'x ($\A{}$)'.format(data.pos_unit))
+        ax.set_ylabel(r'z ($\A{}$)'.format(data.pos_unit))
+        ax.set_zlabel(r'y ($\A{}$)'.format(data.pos_unit))
 
         # I. Plot null points
         if is_zero.any():