Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround modelinspectortest issue with Qt6 #889

Merged
merged 1 commit into from
Dec 26, 2023
Merged

Workaround modelinspectortest issue with Qt6 #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,11 @@ jobs:
# Exclude
# quickmaterialtest|quicktexturetest fails because of QT_QUICK_BACKEND=software AND QT_QPA_PLATFORM=offscreen
# quickinspectortest|quickinspectortest2 fails at CI, local with 6.2.4 passes
# modelinspectortest fails in Qt6/CI passes locally
- name: Run tests on Linux Qt6 (offscreen)
if: ${{ runner.os == 'Linux' && startsWith(matrix.config.qt_version, '6.') }}
run: >
ctest --test-dir ./build-${{ matrix.config.preset }} --output-on-failure
--exclude-regex "quickmaterialtest|quicktexturetest|bindinginspectortest|quickinspectortest|quickinspectortest2|modelinspectortest"
--exclude-regex "quickmaterialtest|quicktexturetest|bindinginspectortest|quickinspectortest|quickinspectortest2"
env:
QT_QPA_PLATFORM: offscreen
QT_QUICK_BACKEND: software
Expand All @@ -112,15 +111,14 @@ jobs:
#28 - probeabidetectortest (Failed)
#31 - launchertest (Failed)
#32 - clientconnectiontest (Failed)
# modelinspectortest fails in Qt6/CI passes locally
# quickinspectortest2
# bindinginspectortest fails in client_and_ui
- name: Run tests Qt6 on macOS
if: ${{ runner.os == 'macOS' && startsWith(matrix.config.qt_version, '6.') }}
run: >
ctest --test-dir ./build-${{ matrix.config.preset }} --output-on-failure
--exclude-regex
"probeabidetectortest|launchertest|clientconnectiontest|modelinspectortest|quickinspectortest2|bindinginspectortest|quicktexturetest"
"probeabidetectortest|launchertest|clientconnectiontest|quickinspectortest2|bindinginspectortest|quicktexturetest"

# Exclude
# quicktexturetest
Expand All @@ -134,12 +132,11 @@ jobs:
# Exclude
# quicktexturetest
# bindinginspectortest
# modelinspectortest fails in Qt6/CI passes locally
- name: Qt6 Run tests on Windows
if: ${{ runner.os == 'Windows' && startsWith(matrix.config.qt_version, '6.') }}
run: >
ctest --test-dir ./build-${{ matrix.config.preset }} -C 'Release' --output-on-failure
--exclude-regex "quicktexturetest|launchertest|bindinginspectortest|modelinspectortest|probesettingstest"
--exclude-regex "quicktexturetest|launchertest|bindinginspectortest|probesettingstest"

- name: Read tests log when it fails
uses: andstor/file-reader-action@v1
Expand Down
11 changes: 11 additions & 0 deletions tests/modelinspectortest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,23 @@ private slots:
QVERIFY(targetModelIdx.isValid());
auto modelSelModel = ObjectBroker::selectionModel(modelModel);
QVERIFY(modelSelModel);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// TODO this breaks QAbstractItemModelTester in Qt6
// when the targetModel->appendRow(item); code is
// executed below a headerDataChanged() is emitted and asserts
modelSelModel->select(targetModelIdx, QItemSelectionModel::ClearAndSelect);
#endif
QCOMPARE(contentModel->rowCount(), 0);

auto item = new QStandardItem("item0,0");
item->setFlags(Qt::NoItemFlags); // should nevertheless be selectable for inspection
targetModel->appendRow(item);

#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
// TODO remove this when the above select does not assert in QAbstractItemModelTester
modelSelModel->select(targetModelIdx, QItemSelectionModel::ClearAndSelect);
#endif

QCOMPARE(contentModel->rowCount(), 1);
QCOMPARE(contentModel->columnCount(), 1);
auto idx = contentModel->index(0, 0);
Expand Down