diff options
| -rw-r--r-- | tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qsqldatabase/tst_qsqldatabase.cpp | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 2377c18..5ef95cd 100644 --- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -83,12 +83,8 @@ public: : QNetworkDiskCache(parent) , gotData(false) { -#ifdef Q_OS_SYMBIAN - QString location = QLatin1String("./cache/"); -#else QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation) + QLatin1String("/qnetworkdiskcache/"); -#endif setCacheDirectory(location); clear(); } diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index 675b170..4198bfc 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -2182,18 +2182,18 @@ void tst_QSqlDatabase::oci_synonymstest() QSqlQuery q(db); QString creator(qTableName("CREATOR")), appuser(qTableName("APPUSER")), table1(qTableName("TABLE1")); // QVERIFY_SQL(q, exec("drop public synonym "+table1)); - QVERIFY_SQL(q, exec(QLatin1String("create user "+creator+" identified by "+creator+" default tablespace users temporary tablespace temp"))); - QVERIFY_SQL(q, exec(QLatin1String("grant CONNECT to "+creator))); - QVERIFY_SQL(q, exec(QLatin1String("grant RESOURCE to "+creator))); + QVERIFY_SQL(q, exec(QString("create user %1 identified by %2 default tablespace users temporary tablespace temp").arg(creator).arg(creator))); + QVERIFY_SQL(q, exec(QString("grant CONNECT to %1").arg(creator))); + QVERIFY_SQL(q, exec(QString("grant RESOURCE to %1").arg(creator))); QSqlDatabase db2=db.cloneDatabase(db, QLatin1String("oci_synonymstest")); db2.close(); QVERIFY_SQL(db2, open(creator,creator)); QSqlQuery q2(db2); - QVERIFY_SQL(q2, exec("create table "+table1+"(id int primary key)")); - QVERIFY_SQL(q, exec(QLatin1String("create user "+appuser+" identified by "+appuser+" default tablespace users temporary tablespace temp"))); - QVERIFY_SQL(q, exec(QLatin1String("grant CREATE ANY SYNONYM to "+appuser))); - QVERIFY_SQL(q, exec(QLatin1String("grant CONNECT to "+appuser))); - QVERIFY_SQL(q2, exec(QLatin1String("grant select, insert, update, delete on "+table1+" to "+appuser))); + QVERIFY_SQL(q2, exec(QString("create table %1(id int primary key)").arg(table1))); + QVERIFY_SQL(q, exec(QString("create user %1 identified by %2 default tablespace users temporary tablespace temp").arg(appuser).arg(appuser))); + QVERIFY_SQL(q, exec(QString("grant CREATE ANY SYNONYM to %1").arg(appuser))); + QVERIFY_SQL(q, exec(QString("grant CONNECT to %1").arg(appuser))); + QVERIFY_SQL(q2, exec(QString("grant select, insert, update, delete on %1 to %2").arg(table1).arg(appuser))); QSqlDatabase db3=db.cloneDatabase(db, QLatin1String("oci_synonymstest2")); db3.close(); QVERIFY_SQL(db3, open(appuser,appuser)); |