[MAINT] Reactivate GUI tests from the CI

.github/workflows/ci.yml

@@ -46,6 +46,8 @@ env:
   INSTALLER_OLD_RUNID: 3204825457
   # The test-installer job can run with the pyinstaller debug bundle
   INSTALLER_USE_DEBUG: false
+  # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html - Required for PySide pytest runner
+  DISPLAY: ':99.0'
 
 jobs:
 
@@ -318,16 +320,22 @@ jobs:
           cd $RUNNER_TEMP
           python -m pytest -v -s test
 
-      # - name: Test GUI (Linux)
-      #   if: ${{ matrix.os == 'ubuntu-latest' }}
-      #   env:
-      #     PYOPENCL_COMPILER_OUTPUT: 1
-      #   run: |
-      #     # Suppress SIGSEGV from the tests until they can be fixed
-      #     retval=0
-      #     xvfb-run -a --server-args="-screen 0 1600x900x24" 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
+      - name: Test GUI (Linux)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        env:
+          PYOPENCL_COMPILER_OUTPUT: 1
+          QT_QPA_PLATFORM: offscreen
+        run: |
+          # Ensure all test running dependencies are installed (https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html)
+          sudo apt install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
+          /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
+          # Run the UI generation routine (with force recreate enabled)
+          python src/sas/qtgui/convertUI.py -f
+          # Suppress SIGSEGV from the tests until they can be fixed
+          retval=0
+          xvfb-run -a --server-args="-screen 0 1600x900x24" 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
 
   installer-matrix:
     needs: [matrix, build-sasview]

pyproject.toml

@@ -208,6 +208,12 @@ pythonpath = "src"
 norecursedirs = [
     "test/sasrealspace",
     "test/calculatorview",
+    "src/sas/qtgui/MainWindow/UnitTesting/Quarantine",
+    "src/sas/qtgui/Perspectives/Fitting/UnitTesting/Quarantine",
+    "src/sas/qtgui/Perspectives/Inversion",
+    "src/sas/qtgui/Perspectives/ParticleEditor",
+    "src/sas/qtgui/Plotting/UnitTesting/Quarantine",
+    "src/sas/qtgui/Utilities/UnitTesting/Quarantine"
 ]
 
 [tool.ruff]

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

@@ -42,7 +42,7 @@ def testDefaults(self, widget, mocker):
                                                         "| (append)]"
         # size
         assert widget.size().height() == 425
-        assert widget.size().width() == 951
+        assert widget.size().width() == 1168
 
         # content of line edits
         assert widget.txtNumber.text() == '1.0'
@@ -67,12 +67,9 @@ def testDefaults(self, widget, mocker):
                                 ['+', '-', '*', '/', '|']
 
         # Tooltips
-        assert str(widget.cmdCompute.toolTip()) == "Generate the Data " \
-                                                            "and send to Data " \
-                                                            "Explorer."
+        assert str(widget.cmdCompute.toolTip()) == "Generate the Data and show the preview."
         assert str(widget.cmdClose.toolTip()) == "Close this panel."
-        assert str(widget.cmdHelp.toolTip()) == \
-                            "Get help on Data Operations."
+        assert str(widget.cmdHelp.toolTip()) == "Get help on Data Operations."
         assert widget.txtNumber.toolTip() == "If no Data2 loaded, " \
                                                 "enter a number to be " \
                                                 "applied to Data1 using " \
@@ -101,15 +98,13 @@ def testDefaults(self, widget, mocker):
         assert not widget.data1OK
 
         mocker.patch.object(widget, 'newPlot')
-        assert widget.newPlot.called_once()
-        assert widget.newPlot.called_once()
-        assert widget.newPlot.called_once()
+        widget.newPlot.assert_not_called()
 
     def testHelp(self, widget, mocker):
         """ Assure help file is shown """
         mocker.patch.object(widget.manager, 'showHelp', create=True)
         widget.onHelp()
-        assert widget.manager.showHelp.called_once()
+        widget.manager.showHelp.assert_called_once()
         args = widget.manager.showHelp.call_args
         assert 'data_operator_help.html' in args[0][0]
 
@@ -125,7 +120,6 @@ def testOnClose(self, widget):
         closeButton = widget.cmdClose
         QTest.mouseClick(closeButton, Qt.LeftButton)
 
-    @pytest.mark.xfail(reason="2022-09 already broken")
     def testOnCompute(self, widget, mocker):
         """ Test onCompute function """
 
@@ -136,6 +130,7 @@ def testOnCompute(self, widget, mocker):
 
         # mock update of plot
         mocker.patch.object(widget, 'updatePlot')
+        mocker.patch.object(widget, 'onPrepareOutputData')
 
         # enable onCompute to run (check on data type)
         mocker.patch.object(widget, 'onCheckChosenData', return_value=True)
@@ -148,11 +143,9 @@ def testOnCompute(self, widget, mocker):
         assert widget.output.x.tolist() == \
                                 widget.data1.x.tolist()
         assert widget.output.y.tolist() == [12.0, 13.0, 14.0]
-        assert widget.updatePlot.called_once()
-
-        mocker.patch.object(widget, 'onPrepareOutputData')
 
-        assert widget.onPrepareOutputData.called_once()
+        widget.updatePlot.assert_called_once()
+        widget.onPrepareOutputData.assert_not_called()
 
     def testOnSelectData1(self, widget, mocker):
         """ Test ComboBox for Data1 """
@@ -168,7 +161,7 @@ def testOnSelectData1(self, widget, mocker):
 
         widget.cbData1.addItems(['Select Data', 'datafile1'])
         widget.cbData1.setCurrentIndex(widget.cbData1.count()-1)
-        assert widget.updatePlot.called_once()
+        widget.updatePlot.assert_called_once()
         # Compute button disabled if data2OK == False
         assert widget.cmdCompute.isEnabled() == widget.data2OK
 
@@ -199,20 +192,20 @@ def testOnSelectData2(self, widget, mocker):
         assert widget.cmdCompute.isEnabled() == widget.data1OK
         assert isinstance(widget.data2, float)
         # call updatePlot
-        assert widget.updatePlot.called_once()
+        widget.updatePlot.assert_called()
 
         # Case 4: when Data2 is a file
         mocker.patch.object(widget, 'filenames', return_value={'datafile2': 'details'})
         widget.cbData2.addItems(['Select Data', 'Number', 'datafile2'])
         widget.cbData2.setCurrentIndex(widget.cbData2.count() - 1)
-        assert widget.updatePlot.called_once()
+        widget.updatePlot.assert_called()
         # editing of txtNumber is disabled when Data2 is a file
         assert not widget.txtNumber.isEnabled()
         # Compute button enabled only if data1OK True
         assert widget.cmdCompute.isEnabled() == \
                             widget.data1OK
         # call updatePlot
-        assert widget.updatePlot.called_once()
+        widget.updatePlot.assert_called()
 
     def testUpdateCombobox(self, widget):
         """ Test change of contents of comboboxes for Data1 and Data2 """
@@ -364,7 +357,6 @@ def testFindId(self, widget):
         id_out = widget._findId('datafile2')
         assert id_out == 'datafile2'
 
-    @pytest.mark.xfail(reason="2022-09 already broken")
     def testExtractData(self, widget):
         """
         Test function to extract data to be computed from input filenames
@@ -385,10 +377,10 @@ def testExtractData(self, widget):
         widget.filenames = {'datafile2': DataState(data2),
                                     'datafile1': DataState(data1)}
         output1D = widget._extractData('datafile1')
-        assert isinstance(output1D, Data1D)
+        assert isinstance(output1D.data, Data1D)
 
         output2D = widget._extractData('datafile2')
-        assert isinstance(output2D, Data2D)
+        assert isinstance(output2D.data, Data2D)
 
     # TODO
     def testOnPrepareOutputData(self, widget):

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

@@ -9,13 +9,13 @@
 class ToMolarMassTest:
     """ Test the auxiliary conversion method"""
     def testGoodEasy(self):
-        assert toMolarMass("H2") == "2.01588"
+        assert toMolarMass("H2") == "2.016"
 
     def testGoodComplex(self):
         assert toMolarMass("H24O12C4C6N2Pu") == "608.304"
 
     def testGoodComplex2(self):
-        assert toMolarMass("(H2O)0.5(D2O)0.5") == "19.0214"
+        assert toMolarMass("(H2O)0.5(D2O)0.5") == "19.0211"
 
     def testBadInputInt(self):
         assert toMolarMass(1) == ""
@@ -47,7 +47,9 @@ def testDefaults(self, widget):
         assert widget.ui.editMolecularFormula.styleSheet() == ''
         assert widget.model.columnCount() == 1
         assert widget.model.rowCount() == 4
-        assert widget.sizePolicy().Policy() == QtWidgets.QSizePolicy.Fixed
+        sp = widget.sizePolicy()
+        assert sp.horizontalPolicy() == QtWidgets.QSizePolicy.Policy.Fixed
+        assert sp.verticalPolicy() == QtWidgets.QSizePolicy.Policy.Fixed
 
 
     def testModelMolecularFormula(self, widget, qtbot):
@@ -89,8 +91,6 @@ def testSimpleEntry(self, widget, qtbot):
         ''' Default compound calculations '''
         qtbot.addWidget(widget)
 
-        widget.show()
-
         qtbot.keyClicks(widget.ui.editMolarVolume, "1.0")
 
         # Send tab x3
@@ -113,14 +113,12 @@ def testSimpleEntry(self, widget, qtbot):
         QTest.qWait(100)
 
         # Assure the molar volume field got updated
-        assert widget.ui.editMolarVolume.text() == '1.126'
+        assert widget.ui.editMolarVolume.text() == '1.1259'
 
     def testComplexEntryAndReset(self, widget, qtbot):
         ''' User entered compound calculations and subsequent reset'''
         qtbot.addWidget(widget)
 
-        widget.show()
-
         widget.ui.editMolecularFormula.clear()
         qtbot.keyClicks(widget.ui.editMolecularFormula, "KMnO4")
         qtbot.keyClicks(widget.ui.editMolarVolume, "2.0")
@@ -136,7 +134,7 @@ def testComplexEntryAndReset(self, widget, qtbot):
         qtbot.keyEvent(QTest.Press, widget, key, QtCore.Qt.NoModifier)
 
         # Assure the mass density field is set
-        assert widget.ui.editMassDensity.text() == '79.017'
+        assert widget.ui.editMassDensity.text() == '79.016'
 
         # Reset the widget
         qtbot.mouseClick(widget.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Reset), QtCore.Qt.LeftButton)
@@ -153,6 +151,6 @@ def testHelp(self, widget, mocker):
         widget.manager = QtWidgets.QWidget()
         mocker.patch.object(widget.manager, 'showHelp', create=True)
         widget.displayHelp()
-        assert widget.manager.showHelp.called_once()
+        widget.manager.showHelp.assert_called_once()
         args = widget.manager.showHelp.call_args
         assert 'density_calculator_help.html' in args[0][0]