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

tst_QSqlQuery coding style: clean up loops

Browse Source 
Prefer pre-decrement over post-decrement, turn a while into a for,
Don't put a while's body on the same line.

Change-Id: I5653a9bcec7901d205a91927c4b08e3dc13e0ca6
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2022-02-09 13:10:10 +01:00
parent e94b579679
commit 7e59139f5c
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -1061,9 +1061,8 @@ void tst_QSqlQuery::value()
QSqlQuery q( db ); QSqlQuery q( db );
QVERIFY_SQL(q, exec(QLatin1String("select id, t_varchar, t_char from %1 order by id") QVERIFY_SQL(q, exec(QLatin1String("select id, t_varchar, t_char from %1 order by id")
.arg(qtest))); .arg(qtest)));
int i = 1;
while ( q.next() ) { for (int i = 1; q.next(); ++i) {
QCOMPARE( q.value( 0 ).toInt(), i ); QCOMPARE( q.value( 0 ).toInt(), i );
QCOMPARE( q.value( "id" ).toInt(), i ); QCOMPARE( q.value( "id" ).toInt(), i );
auto istring = QString::number(i); auto istring = QString::number(i);
@ -1081,8 +1080,6 @@ void tst_QSqlQuery::value()
QCOMPARE(q.value(2).toString(), QLatin1String("Char%1 ").arg(istring)); QCOMPARE(q.value(2).toString(), QLatin1String("Char%1 ").arg(istring));
else else
QCOMPARE(q.value(2).toString(), "Char" + istring); QCOMPARE(q.value(2).toString(), "Char" + istring);
i++;
} }
} }
@ -1366,7 +1363,7 @@ void tst_QSqlQuery::last()
int i = 0; int i = 0;
while ( q.next() ) while ( q.next() )
i++; ++i;
QCOMPARE( q.at(), int( QSql::AfterLastRow ) ); QCOMPARE( q.at(), int( QSql::AfterLastRow ) );
QVERIFY( q.last() ); QVERIFY( q.last() );
@ -1416,7 +1413,8 @@ void tst_QSqlQuery::seek()
QCOMPARE(q.value(0).toInt(), 1); QCOMPARE(q.value(0).toInt(), 1);
qint32 count = 1; qint32 count = 1;
while (q.next()) ++count; while (q.next())
++count;
QCOMPARE(q.at(), int(QSql::AfterLastRow)); QCOMPARE(q.at(), int(QSql::AfterLastRow));
@ -1510,7 +1508,7 @@ void tst_QSqlQuery::forwardOnly()
int i = 0; int i = 0;
while ( q.next() ) while ( q.next() )
i++; ++i;
QVERIFY( q.at() == QSql::AfterLastRow ); QVERIFY( q.at() == QSql::AfterLastRow );
@ -1643,7 +1641,7 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
while (q.next()) { while (q.next()) {
QCOMPARE(q.at(), index); QCOMPARE(q.at(), index);
QCOMPARE(q.value(0).toInt(), index+1); QCOMPARE(q.value(0).toInt(), index+1);
index++; ++index;
} }
QVERIFY(q.at() == QSql::AfterLastRow); QVERIFY(q.at() == QSql::AfterLastRow);
QCOMPARE(index, 3); QCOMPARE(index, 3);
@ -2003,7 +2001,7 @@ void tst_QSqlQuery::precision()
if (!val.startsWith(precStr)) { if (!val.startsWith(precStr)) {
int i = 0; int i = 0;
while (i < val.size() && precStr[i] != 0 && precStr[i] == val[i].toLatin1()) while (i < val.size() && precStr[i] != 0 && precStr[i] == val[i].toLatin1())
i++; ++i;
// TDS has crappy precisions by default // TDS has crappy precisions by default
if (dbType == QSqlDriver::Sybase) { if (dbType == QSqlDriver::Sybase) {
@ -2708,7 +2706,7 @@ void tst_QSqlQuery::batchExec()
q.addBindValue(timeStampCol, QSql::In); q.addBindValue(timeStampCol, QSql::In);
QVariantList emptyDateTimes; QVariantList emptyDateTimes;
emptyDateTimes.reserve(timeStampCol.size()); emptyDateTimes.reserve(timeStampCol.size());
for (int i = 0; i < timeStampCol.size(); i++) for (int i = 0; i < timeStampCol.size(); ++i)
emptyDateTimes << QVariant(QDateTime()); emptyDateTimes << QVariant(QDateTime());
q.addBindValue(emptyDateTimes, QSql::Out); q.addBindValue(emptyDateTimes, QSql::Out);
QVERIFY_SQL(q, execBatch()); QVERIFY_SQL(q, execBatch());
@ -3304,7 +3302,7 @@ void tst_QSqlQuery::nextResult()
// Check result set returned by first statement // Check result set returned by first statement
QVERIFY( q.isSelect() ); // The first statement is a select QVERIFY( q.isSelect() ); // The first statement is a select
for ( int i = 0; i < 3; i++ ) { for (int i = 0; i < 3; ++i) {
QVERIFY_SQL( q, next() ); QVERIFY_SQL( q, next() );
QCOMPARE( q.value( 0 ).toInt(), 1+i ); QCOMPARE( q.value( 0 ).toInt(), 1+i );
QCOMPARE( q.value( 1 ).toString(), tstStrings[i]); QCOMPARE( q.value( 1 ).toString(), tstStrings[i]);
@ -3322,7 +3320,7 @@ void tst_QSqlQuery::nextResult()
QVERIFY_SQL( q, nextResult() ); QVERIFY_SQL( q, nextResult() );
QVERIFY( q.isSelect() ); // The third statement is a SELECT QVERIFY( q.isSelect() ); // The third statement is a SELECT
for ( int i = 0; i < 2; i++ ) { for (int i = 0; i < 2; ++i) {
QVERIFY_SQL( q, next() ); QVERIFY_SQL( q, next() );
QCOMPARE( q.value( 0 ).toInt(), 1+i ); QCOMPARE( q.value( 0 ).toInt(), 1+i );
QCOMPARE(q.value(1).toString(), u"Yatta!"); QCOMPARE(q.value(1).toString(), u"Yatta!");
@ -3417,7 +3415,7 @@ void tst_QSqlQuery::nextResult()
QVERIFY(q.nextResult()); QVERIFY(q.nextResult());
} }
for ( int i = 0; i < 4; i++ ) { for (int i = 0; i < 4; ++i) {
QVERIFY_SQL( q, next() ); QVERIFY_SQL( q, next() );
QCOMPARE( q.value( 0 ).toInt(), i+1 ); QCOMPARE( q.value( 0 ).toInt(), i+1 );
QCOMPARE( q.value( 1 ).toString(), tstStrings[i]); QCOMPARE( q.value( 1 ).toString(), tstStrings[i]);
@ -3426,7 +3424,7 @@ void tst_QSqlQuery::nextResult()
QVERIFY_SQL( q, nextResult() ); QVERIFY_SQL( q, nextResult() );
QVERIFY_SQL( q, isActive() ); QVERIFY_SQL( q, isActive() );
for ( int i = 0; i < 4; i++ ) { for (int i = 0; i < 4; ++i) {
QVERIFY_SQL( q, next() ); QVERIFY_SQL( q, next() );
QCOMPARE(q.value(0).toString(), u"Yatta!"); QCOMPARE(q.value(0).toString(), u"Yatta!");
QCOMPARE( q.value( 1 ).toDouble(), 1.1*( 1+i ) ); QCOMPARE( q.value( 1 ).toDouble(), 1.1*( 1+i ) );
@ -3913,7 +3911,7 @@ void tst_QSqlQuery::QTBUG_6618()
const QString procedureName = qTableName("tst_raiseError", __FILE__, db); const QString procedureName = qTableName("tst_raiseError", __FILE__, db);
q.exec("drop procedure " + procedureName); // non-fatal q.exec("drop procedure " + procedureName); // non-fatal
QString errorString; QString errorString;
for (int i=0;i<110;i++) for (int i = 0; i < 110; ++i)
errorString+="reallylong"; errorString+="reallylong";
errorString+=" error"; errorString+=" error";
QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 as\n" QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 as\n"