From 0a2282f97a2d74ac52d6ba8f33b1eaba0df3668d Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Fri, 2 Sep 2011 12:08:47 +0200 Subject: [PATCH] Moved sql autotests into new directory structure Task-number: QTBUG-21253 Change-Id: Id20605e1247b080e775968b56ea5f56462ca4c71 Reviewed-on: http://codereview.qt.nokia.com/4127 Reviewed-by: Qt Sanity Bot Reviewed-by: Jason McDonald --- tests/auto/auto.pro | 2 +- tests/auto/sql.pro | 14 -------------- tests/auto/sql/kernel/kernel.pro | 11 +++++++++++ tests/auto/{ => sql/kernel}/qsql/.gitignore | 0 tests/auto/{ => sql/kernel}/qsql/qsql.pro | 0 tests/auto/{ => sql/kernel}/qsql/tst_qsql.cpp | 0 .../auto/{ => sql/kernel}/qsqldatabase/.gitignore | 0 .../kernel}/qsqldatabase/qsqldatabase.pro | 0 .../kernel}/qsqldatabase/testdata/qtest.mdb | Bin .../{ => sql/kernel}/qsqldatabase/tst_databases.h | 0 .../kernel}/qsqldatabase/tst_qsqldatabase.cpp | 0 .../{ => sql/kernel}/qsqldriver/qsqldriver.pro | 0 .../kernel}/qsqldriver/tst_qsqldriver.cpp | 0 tests/auto/{ => sql/kernel}/qsqlerror/.gitignore | 0 .../auto/{ => sql/kernel}/qsqlerror/qsqlerror.pro | 0 .../{ => sql/kernel}/qsqlerror/tst_qsqlerror.cpp | 0 tests/auto/{ => sql/kernel}/qsqlfield/.gitignore | 0 .../auto/{ => sql/kernel}/qsqlfield/qsqlfield.pro | 0 .../{ => sql/kernel}/qsqlfield/tst_qsqlfield.cpp | 0 tests/auto/{ => sql/kernel}/qsqlquery/.gitignore | 0 .../auto/{ => sql/kernel}/qsqlquery/qsqlquery.pro | 0 .../{ => sql/kernel}/qsqlquery/tst_qsqlquery.cpp | 0 tests/auto/{ => sql/kernel}/qsqlrecord/.gitignore | 0 .../{ => sql/kernel}/qsqlrecord/qsqlrecord.pro | 0 .../kernel}/qsqlrecord/tst_qsqlrecord.cpp | 0 tests/auto/{ => sql/kernel}/qsqlthread/.gitignore | 0 .../{ => sql/kernel}/qsqlthread/qsqlthread.pro | 0 .../kernel}/qsqlthread/tst_qsqlthread.cpp | 0 tests/auto/sql/models/models.pro | 6 ++++++ .../{ => sql/models}/qsqlquerymodel/.gitignore | 0 .../models}/qsqlquerymodel/qsqlquerymodel.pro | 0 .../models}/qsqlquerymodel/tst_qsqlquerymodel.cpp | 2 +- .../models}/qsqlrelationaltablemodel/.gitignore | 0 .../qsqlrelationaltablemodel.pro | 0 .../tst_qsqlrelationaltablemodel.cpp | 2 +- .../{ => sql/models}/qsqltablemodel/.gitignore | 0 .../models}/qsqltablemodel/qsqltablemodel.pro | 0 .../models}/qsqltablemodel/tst_qsqltablemodel.cpp | 2 +- tests/auto/sql/sql.pro | 5 +++++ 39 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 tests/auto/sql.pro create mode 100644 tests/auto/sql/kernel/kernel.pro rename tests/auto/{ => sql/kernel}/qsql/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsql/qsql.pro (100%) rename tests/auto/{ => sql/kernel}/qsql/tst_qsql.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqldatabase/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqldatabase/qsqldatabase.pro (100%) rename tests/auto/{ => sql/kernel}/qsqldatabase/testdata/qtest.mdb (100%) rename tests/auto/{ => sql/kernel}/qsqldatabase/tst_databases.h (100%) rename tests/auto/{ => sql/kernel}/qsqldatabase/tst_qsqldatabase.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqldriver/qsqldriver.pro (100%) rename tests/auto/{ => sql/kernel}/qsqldriver/tst_qsqldriver.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqlerror/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqlerror/qsqlerror.pro (100%) rename tests/auto/{ => sql/kernel}/qsqlerror/tst_qsqlerror.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqlfield/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqlfield/qsqlfield.pro (100%) rename tests/auto/{ => sql/kernel}/qsqlfield/tst_qsqlfield.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqlquery/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqlquery/qsqlquery.pro (100%) rename tests/auto/{ => sql/kernel}/qsqlquery/tst_qsqlquery.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqlrecord/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqlrecord/qsqlrecord.pro (100%) rename tests/auto/{ => sql/kernel}/qsqlrecord/tst_qsqlrecord.cpp (100%) rename tests/auto/{ => sql/kernel}/qsqlthread/.gitignore (100%) rename tests/auto/{ => sql/kernel}/qsqlthread/qsqlthread.pro (100%) rename tests/auto/{ => sql/kernel}/qsqlthread/tst_qsqlthread.cpp (100%) create mode 100644 tests/auto/sql/models/models.pro rename tests/auto/{ => sql/models}/qsqlquerymodel/.gitignore (100%) rename tests/auto/{ => sql/models}/qsqlquerymodel/qsqlquerymodel.pro (100%) rename tests/auto/{ => sql/models}/qsqlquerymodel/tst_qsqlquerymodel.cpp (99%) rename tests/auto/{ => sql/models}/qsqlrelationaltablemodel/.gitignore (100%) rename tests/auto/{ => sql/models}/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro (100%) rename tests/auto/{ => sql/models}/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp (99%) rename tests/auto/{ => sql/models}/qsqltablemodel/.gitignore (100%) rename tests/auto/{ => sql/models}/qsqltablemodel/qsqltablemodel.pro (100%) rename tests/auto/{ => sql/models}/qsqltablemodel/tst_qsqltablemodel.cpp (99%) create mode 100644 tests/auto/sql/sql.pro diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 5fb6757648a..955c80eb1b7 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,7 +4,7 @@ SUBDIRS += \ corelib.pro \ gui.pro \ network.pro \ - sql.pro \ + sql \ xml.pro \ other.pro diff --git a/tests/auto/sql.pro b/tests/auto/sql.pro deleted file mode 100644 index 7cfd137ae7e..00000000000 --- a/tests/auto/sql.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - qsql \ - qsqldatabase \ - qsqldriver \ - qsqlerror \ - qsqlfield \ - qsqlquery \ - qsqlquerymodel \ - qsqlrecord \ - qsqlrelationaltablemodel \ - qsqltablemodel \ - qsqlthread \ - diff --git a/tests/auto/sql/kernel/kernel.pro b/tests/auto/sql/kernel/kernel.pro new file mode 100644 index 00000000000..579c31a01fe --- /dev/null +++ b/tests/auto/sql/kernel/kernel.pro @@ -0,0 +1,11 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qsqlfield \ + qsqldatabase \ + qsqlerror \ + qsqldriver \ + qsqlquery \ + qsqlrecord \ + qsqlthread \ + qsql \ + diff --git a/tests/auto/qsql/.gitignore b/tests/auto/sql/kernel/qsql/.gitignore similarity index 100% rename from tests/auto/qsql/.gitignore rename to tests/auto/sql/kernel/qsql/.gitignore diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro similarity index 100% rename from tests/auto/qsql/qsql.pro rename to tests/auto/sql/kernel/qsql/qsql.pro diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp similarity index 100% rename from tests/auto/qsql/tst_qsql.cpp rename to tests/auto/sql/kernel/qsql/tst_qsql.cpp diff --git a/tests/auto/qsqldatabase/.gitignore b/tests/auto/sql/kernel/qsqldatabase/.gitignore similarity index 100% rename from tests/auto/qsqldatabase/.gitignore rename to tests/auto/sql/kernel/qsqldatabase/.gitignore diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro similarity index 100% rename from tests/auto/qsqldatabase/qsqldatabase.pro rename to tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro diff --git a/tests/auto/qsqldatabase/testdata/qtest.mdb b/tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb similarity index 100% rename from tests/auto/qsqldatabase/testdata/qtest.mdb rename to tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h similarity index 100% rename from tests/auto/qsqldatabase/tst_databases.h rename to tests/auto/sql/kernel/qsqldatabase/tst_databases.h diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp similarity index 100% rename from tests/auto/qsqldatabase/tst_qsqldatabase.cpp rename to tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro similarity index 100% rename from tests/auto/qsqldriver/qsqldriver.pro rename to tests/auto/sql/kernel/qsqldriver/qsqldriver.pro diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp similarity index 100% rename from tests/auto/qsqldriver/tst_qsqldriver.cpp rename to tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp diff --git a/tests/auto/qsqlerror/.gitignore b/tests/auto/sql/kernel/qsqlerror/.gitignore similarity index 100% rename from tests/auto/qsqlerror/.gitignore rename to tests/auto/sql/kernel/qsqlerror/.gitignore diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro similarity index 100% rename from tests/auto/qsqlerror/qsqlerror.pro rename to tests/auto/sql/kernel/qsqlerror/qsqlerror.pro diff --git a/tests/auto/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp similarity index 100% rename from tests/auto/qsqlerror/tst_qsqlerror.cpp rename to tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp diff --git a/tests/auto/qsqlfield/.gitignore b/tests/auto/sql/kernel/qsqlfield/.gitignore similarity index 100% rename from tests/auto/qsqlfield/.gitignore rename to tests/auto/sql/kernel/qsqlfield/.gitignore diff --git a/tests/auto/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro similarity index 100% rename from tests/auto/qsqlfield/qsqlfield.pro rename to tests/auto/sql/kernel/qsqlfield/qsqlfield.pro diff --git a/tests/auto/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp similarity index 100% rename from tests/auto/qsqlfield/tst_qsqlfield.cpp rename to tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp diff --git a/tests/auto/qsqlquery/.gitignore b/tests/auto/sql/kernel/qsqlquery/.gitignore similarity index 100% rename from tests/auto/qsqlquery/.gitignore rename to tests/auto/sql/kernel/qsqlquery/.gitignore diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro similarity index 100% rename from tests/auto/qsqlquery/qsqlquery.pro rename to tests/auto/sql/kernel/qsqlquery/qsqlquery.pro diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp similarity index 100% rename from tests/auto/qsqlquery/tst_qsqlquery.cpp rename to tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp diff --git a/tests/auto/qsqlrecord/.gitignore b/tests/auto/sql/kernel/qsqlrecord/.gitignore similarity index 100% rename from tests/auto/qsqlrecord/.gitignore rename to tests/auto/sql/kernel/qsqlrecord/.gitignore diff --git a/tests/auto/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro similarity index 100% rename from tests/auto/qsqlrecord/qsqlrecord.pro rename to tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp similarity index 100% rename from tests/auto/qsqlrecord/tst_qsqlrecord.cpp rename to tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp diff --git a/tests/auto/qsqlthread/.gitignore b/tests/auto/sql/kernel/qsqlthread/.gitignore similarity index 100% rename from tests/auto/qsqlthread/.gitignore rename to tests/auto/sql/kernel/qsqlthread/.gitignore diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro similarity index 100% rename from tests/auto/qsqlthread/qsqlthread.pro rename to tests/auto/sql/kernel/qsqlthread/qsqlthread.pro diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp similarity index 100% rename from tests/auto/qsqlthread/tst_qsqlthread.cpp rename to tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp diff --git a/tests/auto/sql/models/models.pro b/tests/auto/sql/models/models.pro new file mode 100644 index 00000000000..d04ba017102 --- /dev/null +++ b/tests/auto/sql/models/models.pro @@ -0,0 +1,6 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qsqlquerymodel \ + qsqlrelationaltablemodel \ + qsqltablemodel \ + diff --git a/tests/auto/qsqlquerymodel/.gitignore b/tests/auto/sql/models/qsqlquerymodel/.gitignore similarity index 100% rename from tests/auto/qsqlquerymodel/.gitignore rename to tests/auto/sql/models/qsqlquerymodel/.gitignore diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro similarity index 100% rename from tests/auto/qsqlquerymodel/qsqlquerymodel.pro rename to tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro diff --git a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp similarity index 99% rename from tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp rename to tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index 073f3da1374..fabba48d7cb 100644 --- a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -53,7 +53,7 @@ #include #include -#include "../qsqldatabase/tst_databases.h" +#include "../../kernel/qsqldatabase/tst_databases.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qsqlrelationaltablemodel/.gitignore b/tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore similarity index 100% rename from tests/auto/qsqlrelationaltablemodel/.gitignore rename to tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro similarity index 100% rename from tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro rename to tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp similarity index 99% rename from tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp rename to tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 5f1a6211aaa..2c5af13c0ce 100644 --- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -43,7 +43,7 @@ #include #include -#include "../qsqldatabase/tst_databases.h" +#include "../../kernel/qsqldatabase/tst_databases.h" const QString reltest1(qTableName("reltest1", __FILE__)), reltest2(qTableName("reltest2", __FILE__)), diff --git a/tests/auto/qsqltablemodel/.gitignore b/tests/auto/sql/models/qsqltablemodel/.gitignore similarity index 100% rename from tests/auto/qsqltablemodel/.gitignore rename to tests/auto/sql/models/qsqltablemodel/.gitignore diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro similarity index 100% rename from tests/auto/qsqltablemodel/qsqltablemodel.pro rename to tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp similarity index 99% rename from tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp rename to tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index 96a1f1caa53..07efd4a3a1e 100644 --- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -41,7 +41,7 @@ #include -#include "../qsqldatabase/tst_databases.h" +#include "../../kernel/qsqldatabase/tst_databases.h" #include const QString test(qTableName("test", __FILE__)), diff --git a/tests/auto/sql/sql.pro b/tests/auto/sql/sql.pro new file mode 100644 index 00000000000..99f6e38cf82 --- /dev/null +++ b/tests/auto/sql/sql.pro @@ -0,0 +1,5 @@ +TEMPLATE=subdirs +SUBDIRS=\ + kernel \ + models \ +