summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-12-10 21:40:20 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-12-13 05:23:30 +0000
commitbfed898935e902d51aed6da54a986042f61afbcf (patch)
treedf6726c8e784d9d414c568aff54c66975060b7c0
parenta0bda7fc1b6a6251555b6e14aff93787bc130b47 (diff)
Fix auto-test duplicate date row name
Change-Id: If53f12134f0183acde30701d9a35a2a49cdb8779 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 376bc5c17126e4192eee3a1e0196fcedbc7325fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/applicationinstaller/tst_applicationinstaller.cpp22
-rw-r--r--tests/auto/debugwrapper/tst_debugwrapper.cpp2
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
index 0dd2371f..c6e4b6ec 100644
--- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
@@ -716,7 +716,7 @@ void tst_PackageManager::validateDnsName_data()
QTest::newRow("invalid-char1") << "com.pelagi_core.test" << 3 << false;
QTest::newRow("invalid-char2") << "com.pelagi#core.test" << 3 << false;
QTest::newRow("invalid-char3") << "com.pelagi$core.test" << 3 << false;
- QTest::newRow("invalid-char3") << "com.pelagi@core.test" << 3 << false;
+ QTest::newRow("invalid-char4") << "com.pelagi@core.test" << 3 << false;
QTest::newRow("unicode-char") << QString::fromUtf8("c\xc3\xb6m.pelagicore.test") << 3 << false;
QTest::newRow("upper-case") << "com.Pelagicore.test" << 3 << false;
QTest::newRow("dash-at-start") << "com.-pelagicore.test" << 3 << false;
@@ -755,16 +755,16 @@ void tst_PackageManager::compareVersions_data()
QTest::newRow("10") << "1.99" << "2.0" << -1;
QTest::newRow("11") << "1.9" << "11" << -1;
QTest::newRow("12") << "9" << "10" << -1;
- QTest::newRow("12") << "9a" << "10" << -1;
- QTest::newRow("13") << "9-a" << "10" << -1;
- QTest::newRow("14") << "13.403.51-alpha2+gi" << "13.403.51-alpha2+git" << -1;
- QTest::newRow("15") << "13.403.51-alpha1+git" << "13.403.51-alpha2+git" << -1;
- QTest::newRow("16") << "13.403.51-alpha2+git" << "13.403.51-beta1+git" << -1;
- QTest::newRow("17") << "13.403.51-alpha2+git" << "13.403.52" << -1;
- QTest::newRow("18") << "13.403.51-alpha2+git" << "13.403.52-alpha2+git" << -1;
- QTest::newRow("19") << "13.403.51-alpha2+git" << "13.404" << -1;
- QTest::newRow("20") << "13.402" << "13.403.51-alpha2+git" << -1;
- QTest::newRow("21") << "12.403.51-alpha2+git" << "13.403.51-alpha2+git" << -1;
+ QTest::newRow("13") << "9a" << "10" << -1;
+ QTest::newRow("14") << "9-a" << "10" << -1;
+ QTest::newRow("15") << "13.403.51-alpha2+gi" << "13.403.51-alpha2+git" << -1;
+ QTest::newRow("16") << "13.403.51-alpha1+git" << "13.403.51-alpha2+git" << -1;
+ QTest::newRow("17") << "13.403.51-alpha2+git" << "13.403.51-beta1+git" << -1;
+ QTest::newRow("18") << "13.403.51-alpha2+git" << "13.403.52" << -1;
+ QTest::newRow("19") << "13.403.51-alpha2+git" << "13.403.52-alpha2+git" << -1;
+ QTest::newRow("20") << "13.403.51-alpha2+git" << "13.404" << -1;
+ QTest::newRow("21") << "13.402" << "13.403.51-alpha2+git" << -1;
+ QTest::newRow("22") << "12.403.51-alpha2+git" << "13.403.51-alpha2+git" << -1;
}
void tst_PackageManager::compareVersions()
diff --git a/tests/auto/debugwrapper/tst_debugwrapper.cpp b/tests/auto/debugwrapper/tst_debugwrapper.cpp
index 769ebd3e..123f57ed 100644
--- a/tests/auto/debugwrapper/tst_debugwrapper.cpp
+++ b/tests/auto/debugwrapper/tst_debugwrapper.cpp
@@ -70,7 +70,7 @@ void tst_DebugWrapper::specification_data()
QTest::newRow("y") << "a=b %program% c d" << true << ByteArrayMap {{ "a", "b" }} << QByteArrayList { "%program%", "c", "d", "%arguments%" };
QTest::newRow("x") << "a=b %arguments%" << true << ByteArrayMap {{ "a", "b" }} << QByteArrayList { "%arguments%", "%program%" };
QTest::newRow("w") << "%program% %arguments%" << true << noenv << QByteArrayList { "%program%", "%arguments%" };
- QTest::newRow("w") << "%program% foo-%program% foo-%arguments%-bar %arguments%" << true << noenv << QByteArrayList { "%program%", "foo-%program%", "foo-%arguments%-bar", "%arguments%" };
+ QTest::newRow("v") << "%program% foo-%program% foo-%arguments%-bar %arguments%" << true << noenv << QByteArrayList { "%program%", "foo-%program%", "foo-%arguments%-bar", "%arguments%" };
}
void tst_DebugWrapper::specification()