From c2118a461a0d2e93229198f342c1fc253ccc20fd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 12 Dec 2022 10:25:01 +0100 Subject: [PATCH] tst_qxmlstream: swap WHEN and THEN in readBack() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WHEN writing an invalid character, THEN we expect the writer to report an error. The old code had it the wrong way around. It checked that WHEN the writer reports an error, THEN the character was invalid. The formulations are equivalent, but the latter is mixing up cause and effect, making it less clear what's being checked (QXmlStreamWriter, not isValidSingleTextChar()), so swap. Change-Id: I703de9ddde98d9913977a913f671472930735900 Reviewed-by: Mårten Nordheim Reviewed-by: Mate Barany (cherry picked from commit 7d0f08094a2318b753ea7d69b71c0abe0a46b3d3) Reviewed-by: Qt Cherry-pick Bot --- .../corelib/serialization/qxmlstream/tst_qxmlstream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp index b88ec186528..7f81d79672f 100644 --- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp @@ -1691,10 +1691,10 @@ void tst_QXmlStream::readBack() const writer.writeEndDocument(); buffer.close(); - if (writer.hasError()) { - QVERIFY2(!isValidSingleTextChar(c), QByteArray::number(c)); + if (!isValidSingleTextChar(c)) { + QVERIFY2(writer.hasError(), QByteArray::number(c)); } else { - QVERIFY2(isValidSingleTextChar(c), QByteArray::number(c)); + QVERIFY2(!writer.hasError(), QByteArray::number(c)); QVERIFY(buffer.open(QIODevice::ReadOnly)); QXmlStreamReader reader(&buffer); do {