From 9bb1efe33dd487157e0c86c4632eec678571a449 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 15 Jun 2023 15:37:43 +0300 Subject: [PATCH] QStringBuilder: one less macro in unittests Two QCOMPARE calls aren't worth the extra indirection. Change-Id: If3b54d303c28582c7df29a3f1c4dc1a2c2a974f4 Reviewed-by: Thiago Macieira --- .../qstringbuilder1/stringbuilder.cpp | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp index 06dc1ec5a59..1d452e1e3eb 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp @@ -261,15 +261,10 @@ void runScenario() #define CHECK(QorP, a1, a2) \ do { \ - DO(QorP, a1, a2); \ - DO(QorP, a2, a1); \ + QCOMPARE(QString(a1 QorP a2), toQString(a1).append(toQString(a2))); \ + QCOMPARE(QString(a2 QorP a1), toQString(a2).append(toQString(a1))); \ } while (0) -#define DO(QorP, a1, a2) \ - QCOMPARE(QString(a1 QorP a2), \ - toQString(a1).append(toQString(a2))) \ - /* end */ - CHECK(P, l1string, l1string); CHECK(P, l1string, string); CHECK(Q, l1string, stringview); @@ -335,12 +330,13 @@ void runScenario() // CHECK(Q, u16charstar, u16charstar); // BUILTIN <-> BUILTIN cat't be overloaded -#undef DO +#undef CHECK -#define DO(QorP, a1, a2) \ - QCOMPARE(QByteArray(a1 QorP a2), \ - toQByteArray(a1).append(toQByteArray(a2))) \ - /* end */ +#define CHECK(QorP, a1, a2) \ + do { \ + QCOMPARE(QByteArray(a1 QorP a2), toQByteArray(a1).append(toQByteArray(a2))); \ + QCOMPARE(QByteArray(a2 QorP a1), toQByteArray(a2).append(toQByteArray(a1))); \ + } while (0) QByteArray bytearray = stringview.toUtf8(); char *charstar = bytearray.data(); @@ -367,7 +363,6 @@ void runScenario() //CHECK(Q, achar, achar); // BUILTIN <-> BUILTIN cat't be overloaded -#undef DO #undef CHECK QString r2(QLatin1String(LITERAL LITERAL));