1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up tst_QWidget::saveRestoreGeometry()

Browse Source 
Use QTRY_COMPARE_NE(a, b) instead of QTRY_VERIFY(a != b).
Add correct skip reason for macOS and add a code comment on failure
location.
Remove unnecesary string view usage.

Change-Id: If63af01e639f8e9568722a4fc685cb8057282cd5
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
This commit is contained in:
Axel Spoerl 2024-11-29 14:52:08 +01:00
parent 39678d3686
commit 182604ae9c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -4325,7 +4325,7 @@ void tst_QWidget::restoreGeometryFromInvalidArray()
void tst_QWidget::saveRestoreGeometry() void tst_QWidget::saveRestoreGeometry()
{ {
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
QSKIP("QTBUG-52974"); QSKIP("macOS fails to restore from fullscreen");
#endif #endif
if (m_platform == QStringLiteral("wayland")) if (m_platform == QStringLiteral("wayland"))
@ -4353,7 +4353,7 @@ void tst_QWidget::saveRestoreGeometry()
{ {
QWidget widget; QWidget widget;
widget.setWindowFlags(Qt::X11BypassWindowManagerHint); widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
widget.setWindowTitle(QLatin1String(QTest::currentTestFunction())); widget.setWindowTitle(QTest::currentTestFunction());
QVERIFY(widget.restoreGeometry(savedGeometry)); QVERIFY(widget.restoreGeometry(savedGeometry));
widget.showNormal(); widget.showNormal();
@ -4384,7 +4384,7 @@ void tst_QWidget::saveRestoreGeometry()
widget.setWindowState(widget.windowState() | Qt::WindowFullScreen); widget.setWindowState(widget.windowState() | Qt::WindowFullScreen);
QTRY_VERIFY((widget.windowState() & Qt::WindowFullScreen)); QTRY_VERIFY((widget.windowState() & Qt::WindowFullScreen));
QVERIFY(widget.restoreGeometry(savedGeometry)); QVERIFY(widget.restoreGeometry(savedGeometry));
QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen)); QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen)); // macOS fails here
QTRY_COMPARE(widget.geometry(), geom); QTRY_COMPARE(widget.geometry(), geom);
//Restore to full screen //Restore to full screen
@ -4409,7 +4409,7 @@ void tst_QWidget::saveRestoreGeometry()
geom = widget.geometry(); geom = widget.geometry();
widget.setWindowState(widget.windowState() | Qt::WindowMaximized); widget.setWindowState(widget.windowState() | Qt::WindowMaximized);
QTRY_VERIFY((widget.windowState() & Qt::WindowMaximized)); QTRY_VERIFY((widget.windowState() & Qt::WindowMaximized));
QTRY_VERIFY(widget.geometry() != geom); QTRY_COMPARE_NE(widget.geometry(), geom);
QVERIFY(widget.restoreGeometry(savedGeometry)); QVERIFY(widget.restoreGeometry(savedGeometry));
QTRY_COMPARE(widget.geometry(), geom); QTRY_COMPARE(widget.geometry(), geom);