SQL/Tests: use TableScope where possible

Use TableScope helper class to make sure the table used for the test is
really cleaned up before usage.

Change-Id: I45fffcd13acae6032636ae07097b14af174ede21
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 7 insertions, 9 deletions

diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index a174ea6f37..7e6289e911 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -258,18 +258,16 @@ void tst_QSqlThread::generic_data(const QString& engine)
 
 void tst_QSqlThread::dropTestTables()
 {
-    for (int i = 0; i < dbs.dbNames.size(); ++i) {
-        QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i));
-        QSqlQuery q(db);
-
-        tst_Databases::safeDropTables(db, QStringList() << qtest << qTableName("qtest2", __FILE__, db) << qTableName("emptytable", __FILE__, db));
+    for (const auto &dbName : dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName);
+        tst_Databases::safeDropTables(db, { qtest, qTableName("qtest2", __FILE__, db), qTableName("emptytable", __FILE__, db) });
     }
 }
 
 void tst_QSqlThread::createTestTables()
 {
-    for (int i = 0; i < dbs.dbNames.size(); ++i) {
-        QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i));
+    for (const auto &dbName : dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName);
         QSqlQuery q(db);
 
         QVERIFY_SQL(q, exec("create table " + qtest
@@ -285,8 +283,8 @@ void tst_QSqlThread::createTestTables()
 
 void tst_QSqlThread::repopulateTestTables()
 {
-    for (int i = 0; i < dbs.dbNames.size(); ++i) {
-        QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i));
+    for (const auto &dbName : dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName);
         QSqlQuery q(db);
 
         QVERIFY_SQL(q, exec("delete from " + qtest));