From 182604ae9ce5fac6c1c79bb3f21b5d50e6da7258 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 29 Nov 2024 14:52:08 +0100 Subject: [PATCH] Clean up tst_QWidget::saveRestoreGeometry() 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 --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 2bf504b76cb..16136b67a34 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -4325,7 +4325,7 @@ void tst_QWidget::restoreGeometryFromInvalidArray() void tst_QWidget::saveRestoreGeometry() { #ifdef Q_OS_MACOS - QSKIP("QTBUG-52974"); + QSKIP("macOS fails to restore from fullscreen"); #endif if (m_platform == QStringLiteral("wayland")) @@ -4353,7 +4353,7 @@ void tst_QWidget::saveRestoreGeometry() { QWidget widget; widget.setWindowFlags(Qt::X11BypassWindowManagerHint); - widget.setWindowTitle(QLatin1String(QTest::currentTestFunction())); + widget.setWindowTitle(QTest::currentTestFunction()); QVERIFY(widget.restoreGeometry(savedGeometry)); widget.showNormal(); @@ -4384,7 +4384,7 @@ void tst_QWidget::saveRestoreGeometry() widget.setWindowState(widget.windowState() | Qt::WindowFullScreen); QTRY_VERIFY((widget.windowState() & Qt::WindowFullScreen)); QVERIFY(widget.restoreGeometry(savedGeometry)); - QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen)); + QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen)); // macOS fails here QTRY_COMPARE(widget.geometry(), geom); //Restore to full screen @@ -4409,7 +4409,7 @@ void tst_QWidget::saveRestoreGeometry() geom = widget.geometry(); widget.setWindowState(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)); QTRY_COMPARE(widget.geometry(), geom);