From a4b8399957fa9515d6b9a3e10458e7034a3d6e22 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 12 Apr 2024 15:41:17 +0200 Subject: [PATCH] Fix duplicate data tag tst_QDate::fromStringFormat:year-match-1999 There were two of it. The "year-match-*" tests have two year fields, one four-digit the other two-digit, and deal with whether they match. The second year-match-1999 had, however, only a "yy" year format; it in fact belongs to the "just-yy-*" family that follows. So rename it. Amends commit 5108192f67042656afdb3508f8cc2563167fae97 which landed in 6.7. Task-number: QTBUG-107185 Change-Id: Ibfe0c33cb00dc068d0f670d27c43ec4dc4550c05 Reviewed-by: Thiago Macieira (cherry picked from commit de5c507a55097c08602f38062bf5291c9cbb4e24) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/time/qdate/tst_qdate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp index 66d75715501..cacdad307fc 100644 --- a/tests/auto/corelib/time/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp @@ -1334,7 +1334,7 @@ void tst_QDate::fromStringFormat_data() QTest::newRow("year-match-1999") << u"1999:99"_s << u"yyyy:yy"_s << 1900 << QDate(1999, 1, 1); QTest::newRow("year-match-2099") << u"2099:99"_s << u"yyyy:yy"_s << 1900 << QDate(2099, 1, 1); QTest::newRow("year-match-2001") << u"2001:01"_s << u"yyyy:yy"_s << 1900 << QDate(2001, 1, 1); - QTest::newRow("year-match-1999") << u"99"_s << u"yy"_s << 1900 << QDate(1999, 1, 1); + QTest::newRow("just-yy-1999") << u"99"_s << u"yy"_s << 1900 << QDate(1999, 1, 1); QTest::newRow("just-yy-1901") << u"01"_s << u"yy"_s << 1900 << QDate(1901, 1, 1); QTest::newRow("just-yy-2001") << u"01"_s << u"yy"_s << 1970 << QDate(2001, 1, 1);