From f50b853bed00f3f772407cce3fe7935f88d16811 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Fri, 17 Mar 2023 12:15:10 +0100 Subject: [PATCH] Adjust window rectangle for menu baseline test case Capturing complete window for menu test cases makes it fail as there can be different window shapes (such as rectangular or rounded corners). To avoid this, its better to capture only minimal visual portion that can be compared against. Change-Id: I30e85589fce8c17115f511a7a345d46949e6c9e8 Reviewed-by: Volker Hilsheimer --- tests/baseline/widgets/tst_baseline_widgets.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/baseline/widgets/tst_baseline_widgets.cpp b/tests/baseline/widgets/tst_baseline_widgets.cpp index 4b59b211b0d..366a1704594 100644 --- a/tests/baseline/widgets/tst_baseline_widgets.cpp +++ b/tests/baseline/widgets/tst_baseline_widgets.cpp @@ -1156,8 +1156,11 @@ void tst_Widgets::tst_QMenu() testWindow()->show(); QVERIFY(QTest::qWaitForWindowExposed(testWindow())); - QRect testWindowRect(testWindow()->geometry()); + // There can be rounded corners in the window and this leads to test + // case to be fuzzy. Adjust window rectangle that need to be captured + int adjustPixel = menu1.geometry().left(); + testWindowRect.adjust(adjustPixel, adjustPixel, -adjustPixel, -adjustPixel); QBASELINE_CHECK_DEFERRED(takeScreenSnapshot(testWindowRect), "showitems"); // Normal menu item with text