From 691de7f6963930911e0d4dbade851ba749522ac7 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 4 Oct 2022 19:29:01 +0200 Subject: [PATCH] Rename some tst_QTextStream::manipulators() data rows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two rows named "hex" were a collision we should avoid. The two "showpos" rows could be better distinguished. Change-Id: I43727041eb00e6883ce8b34b346de5e2a63f1a34 Reviewed-by: Mårten Nordheim --- .../corelib/serialization/qtextstream/tst_qtextstream.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp index 7c21dd39c4..425855d4eb 100644 --- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp @@ -2661,16 +2661,16 @@ void tst_QTextStream::manipulators_data() QTest::newRow("leftadjust") << 10 << int(QTextStream::AlignLeft) << 0 << 10 << 5.0 << 5 << QString("five") << QByteArray("5 5 five "); - QTest::newRow("showpos") + QTest::newRow("showpos-wide") << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 10 << 5.0 << 5 << QString("five") << QByteArray(" +5 +5 five"); - QTest::newRow("showpos2") + QTest::newRow("showpos-pi") << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 5 << 3.14 << -5 << QString("five") << QByteArray("+3.14 -5 five"); - QTest::newRow("hex") + QTest::newRow("hex-lower") << 16 << int(QTextStream::AlignRight) << int(QTextStream::ShowBase) << 5 << 3.14 << -5 << QString("five") << QByteArray(" 3.14 -0x5 five"); - QTest::newRow("hex") + QTest::newRow("hex-upper") << 16 << int(QTextStream::AlignRight) << int(QTextStream::ShowBase | QTextStream::UppercaseBase) << 5 << 3.14 << -5 << QString("five") << QByteArray(" 3.14 -0X5 five");