From 495e127d07c234c9ccbdb50a8400fded1c80fb32 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 21 Oct 2022 18:44:07 +0300 Subject: [PATCH] autotests: Fix windowquadlist with Qt 6 In Qt 6, container.count() returns a qsizetype, on the other hand expectedCount is int. That type difference makes QTEST panic. --- autotests/libkwineffects/windowquadlisttest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autotests/libkwineffects/windowquadlisttest.cpp b/autotests/libkwineffects/windowquadlisttest.cpp index e7c755ac67..4be9cbb03c 100644 --- a/autotests/libkwineffects/windowquadlisttest.cpp +++ b/autotests/libkwineffects/windowquadlisttest.cpp @@ -84,8 +84,9 @@ void WindowQuadListTest::testMakeGrid() { QFETCH(KWin::WindowQuadList, orig); QFETCH(int, quadSize); + QFETCH(int, expectedCount); KWin::WindowQuadList actual = orig.makeGrid(quadSize); - QTEST(actual.count(), "expectedCount"); + QCOMPARE(actual.count(), expectedCount); QFETCH(KWin::WindowQuadList, expected); for (auto it = actual.constBegin(); it != actual.constEnd(); ++it) { @@ -172,8 +173,9 @@ void WindowQuadListTest::testMakeRegularGrid() QFETCH(KWin::WindowQuadList, orig); QFETCH(int, xSubdivisions); QFETCH(int, ySubdivisions); + QFETCH(int, expectedCount); KWin::WindowQuadList actual = orig.makeRegularGrid(xSubdivisions, ySubdivisions); - QTEST(actual.count(), "expectedCount"); + QCOMPARE(actual.count(), expectedCount); QFETCH(KWin::WindowQuadList, expected); for (auto it = actual.constBegin(); it != actual.constEnd(); ++it) {