1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up in tst_QDateTime

Browse Source 
Use QCOMPARE rather than QVERIFY an equality; ditch a stray blank line.

Change-Id: Ie828837919fb9d3cc774d82d0eebcf7728fed645
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2019-05-22 15:30:27 +02:00
parent dca0efc70d
commit cf909f0ef6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2016 Intel Corporation. ** Copyright (C) 2016 Intel Corporation.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
@ -1005,7 +1005,6 @@ void tst_QDateTime::toString_enumformat()
{ {
QDateTime dt1(QDate(1995, 5, 20), QTime(12, 34, 56)); QDateTime dt1(QDate(1995, 5, 20), QTime(12, 34, 56));
QString str1 = dt1.toString(Qt::TextDate); QString str1 = dt1.toString(Qt::TextDate);
QVERIFY(!str1.isEmpty()); // It's locale dependent everywhere QVERIFY(!str1.isEmpty()); // It's locale dependent everywhere
@ -2776,9 +2775,9 @@ void tst_QDateTime::getDate()
int y = -33, m = -44, d = -55; int y = -33, m = -44, d = -55;
QDate date; QDate date;
date.getDate(&y, &m, &d); date.getDate(&y, &m, &d);
QVERIFY(date.year() == y); QCOMPARE(date.year(), y);
QVERIFY(date.month() == m); QCOMPARE(date.month(), m);
QVERIFY(date.day() == d); QCOMPARE(date.day(), d);
date.getDate(0, 0, 0); date.getDate(0, 0, 0);
} }
@ -2790,9 +2789,9 @@ void tst_QDateTime::getDate()
date.getDate(&y, 0, 0); date.getDate(&y, 0, 0);
date.getDate(0, 0, &d); date.getDate(0, 0, &d);
QVERIFY(date.year() == y); QCOMPARE(date.year(), y);
QVERIFY(date.month() == m); QCOMPARE(date.month(), m);
QVERIFY(date.day() == d); QCOMPARE(date.day(), d);
} }
} }