Merge pull request #5 from source-foundry/models-updates

Update models based on qtmodeltester tests

Author: chrissimpkins

.github/workflows/python-ci.yml

@@ -7,8 +7,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
         python-version: [3.9]
+    env:
+      DISPLAY: ":99.0"
 
     steps:
       - uses: actions/checkout@v2
@@ -20,7 +22,3 @@ jobs:
         run: |
           python -c "import sys; print(sys.version)"
           python -c "import struct; print(struct.calcsize('P') * 8)"
-      - name: Install testing dependencies
-        run: python -m pip install --upgrade pip setuptools wheel tox tox-gh-actions pytest pytest-qt
-      - name: Run tox tests
-        run: python -m tox

dev-requirements.txt

@@ -5,4 +5,3 @@ tox
 black
 flake8
 isort
-

src/slice/models.py

@@ -36,10 +36,22 @@ def setData(self, index, value, role):
             return False
 
     def rowCount(self, index):
-        return len(self._data)
+        # the index validity check approach addresses the qabstractitemmodel.cpp check:
+        # QtWarningMsg: FAIL! model->hasChildren(topIndex) () returned FALSE (qabstractitemmodeltester.cpp:366)
+        # See https://stackoverflow.com/a/50988188/2848172
+        if index.isValid():
+            return 0
+        else:
+            return len(self._data)
 
     def columnCount(self, index):
-        return len(self._data[0])
+        # the index validity check approach addresses the qabstractitemmodel.cpp check:
+        # QtWarningMsg: FAIL! model->hasChildren(topIndex) () returned FALSE (qabstractitemmodeltester.cpp:366)
+        # See https://stackoverflow.com/a/50988188/2848172
+        if index.isValid():
+            return 0
+        else:
+            return len(self._data[0])
 
     def get_data(self):
         return self._data
@@ -193,13 +205,18 @@ def headerData(self, section, orientation, role):
             return self._h_header[section]
 
     def flags(self, index):
+        # Note: index validity checks in this block address qabstractitemmodeltester error:
+        # QtWarningMsg: FAIL! flags == Qt::ItemIsDropEnabled || flags == 0 () returned FALSE (qabstractitemmodeltester.cpp:329)
+
         # column 0 (axis value range and default) is set
         # to non-editable
-        if index.column() == 0:
+        if index.isValid() and index.column() == 0:
             return super().flags(index) | Qt.ItemIsSelectable
         # column 1 (instance value) is set to editable
-        else:
+        elif index.isValid() and index.column() == 1:
             return super().flags(index) | Qt.ItemIsEditable
+        else:
+            return super().flags(index)
 
     def load_font(self, font_model):
         ttfont = TTFont(font_model.fontpath)

tests/test_models.py

@@ -0,0 +1,21 @@
+from PyQt5.QtWidgets import QTableView
+
+from slice.models import DesignAxisModel, FontModel, FontBitFlagModel, FontNameModel
+
+
+def test_font_model():
+    fm = FontModel("testpath")
+    assert fm.fontpath == "testpath"
+
+
+def test_designaxis_model_default(qtbot, qtmodeltester):
+    tableview = QTableView()
+    model = DesignAxisModel()
+    tableview.setModel(model)
+    qtbot.addWidget(tableview)
+    # check model with default instantiation
+    qtmodeltester.check(model)
+
+
+def test_designaxis_model_filled(qtbot, qtmodeltester):
+    pass

tests/test_widgets.py

@@ -1,14 +1,14 @@
-import pytest
-
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QWidget, QApplication
 from PyQt5.QtTest import QTest
 
 from slice.ui.widgets import DragDropLineEdit
 
 
-def test_drag_drop_line_edit():
+def test_drag_drop_line_edit(qtbot):
     widget1 = QWidget()
     widget2 = DragDropLineEdit(widget1)
+    qtbot.addWidget(widget1)
+    qtbot.addWidget(widget2)
     # placeholder text
     assert (
         widget2.placeholderText() == "Drop a variable font here or click the Open button"

tox.ini

@@ -5,9 +5,7 @@ envlist = py38,py39
 commands =
     pytest {posargs}
 deps =
-    -rrequirements.txt
-    pytest
-    pytest-qt
+    -rdev-requirements.txt
 
 [gh-actions]
 python =