AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStringBuilder: one less macro in unittests

Browse Source 
Two QCOMPARE calls aren't worth the extra indirection.

Change-Id: If3b54d303c28582c7df29a3f1c4dc1a2c2a974f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-06-15 15:37:43 +03:00
parent 83f20dad5c
commit 9bb1efe33d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
View File

@ -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));