From ef8905aa2ba266c7d58c60506e516ed6cf4e81f4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 5 Oct 2022 11:49:31 +0200 Subject: [PATCH] tst_QFile: distinguish invalid from valid in mapResource data-tags The test was using the same tags twice each, giving no clue to the difference between the two test-cases for each. Change-Id: I645b01c0c4008a766e505047cb05cc22640ee129 Reviewed-by: Dimitrios Apostolou --- tests/auto/corelib/io/qfile/tst_qfile.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index ee96797445..ee16521e89 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -3274,13 +3274,15 @@ void tst_QFile::mapResource_data() QString validFile = ":/tst_qfileinfo/resources/file1.ext1"; QString invalidFile = ":/tst_qfileinfo/resources/filefoo.ext1"; + const char modes[] = "invalid"; for (int i = 0; i < 2; ++i) { QString file = (i == 0) ? validFile : invalidFile; - QTest::newRow("0, 0") << 0 << 0 << QFile::UnspecifiedError << file; - QTest::newRow("0, BIG") << 0 << 4096 << QFile::UnspecifiedError << file; - QTest::newRow("-1, 0") << -1 << 0 << QFile::UnspecifiedError << file; - QTest::newRow("0, -1") << 0 << -1 << QFile::UnspecifiedError << file; + const char *mode = i == 0 ? modes + 2 : modes; + QTest::addRow("0, 0 (%s)", mode) << 0 << 0 << QFile::UnspecifiedError << file; + QTest::addRow("0, BIG (%s)", mode) << 0 << 4096 << QFile::UnspecifiedError << file; + QTest::addRow("-1, 0 (%s)", mode) << -1 << 0 << QFile::UnspecifiedError << file; + QTest::addRow("0, -1 (%s)", mode) << 0 << -1 << QFile::UnspecifiedError << file; } QTest::newRow("0, 1") << 0 << 1 << QFile::NoError << validFile;