diff options
Diffstat (limited to 'odb-tests/qt/common/containers')
8 files changed, 233 insertions, 106 deletions
diff --git a/odb-tests/qt/common/containers/basics/buildfile b/odb-tests/qt/common/containers/basics/buildfile new file mode 100644 index 0000000..2c1b8f3 --- /dev/null +++ b/odb-tests/qt/common/containers/basics/buildfile @@ -0,0 +1,51 @@ +# file : qt/common/containers/basics/buildfile +# license : GNU GPL v2; see accompanying LICENSE file + +if ($build.meta_operation != 'dist') +{ + assert ($qt) \ + "Qt version should be configured for this test via config.odb_tests.qt variable" +} + +import meta_libs = libodb%lib{odb} +import meta_libs += libodb-qt%lib{odb-qt} +import meta_libs += "libQt$(qt_ver)Core"%lib{"Qt$(qt_ver)Core"} + +libs = + +for db: $databases + import libs += libodb-$db%lib{odb-$db} + +import libs += lib{common} + +exe{driver}: {hxx cxx}{* -test-odb -test-odb-*} {hxx ixx cxx}{test-odb} testscript + +# Introduce the metadata library target to make sure the libodb library is +# resolved for the odb_compile ad hoc rule (see build/root.build for details). +# +libue{test-meta}: $meta_libs + +<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta} + +for db: $databases +{ + exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi + <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta} +} + +exe{driver}: libue{test-meta} $libs + +# Specify the ODB custom options to be used by the odb_compile ad hoc rule +# (see build/root.build for details). +# +odb_options = --std ($qt_ver == 5 ? c++11 : c++17) \ + --table-prefix qt_cont_bs_ \ + --profile qt/containers \ + --profile qt/basic \ + --generate-schema + +cxx.poptions =+ "-I$out_base" "-I$src_base" + +# Testscript's run-time prerequisites. +# +exe{driver}: ../../../../alias{database-client}: include = adhoc diff --git a/odb-tests/qt/common/containers/basics/driver.cxx b/odb-tests/qt/common/containers/basics/driver.cxx index 5e38ee1..8d59796 100644 --- a/odb-tests/qt/common/containers/basics/driver.cxx +++ b/odb-tests/qt/common/containers/basics/driver.cxx @@ -4,7 +4,7 @@ // Test basic Qt containers persistence. // -#include <memory> // std::auto_ptr +#include <memory> // std::unique_ptr #include <cassert> #include <iostream> @@ -13,11 +13,14 @@ #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <common/common.hxx> +#include <libcommon/common.hxx> #include "test.hxx" #include "test-odb.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace odb::core; @@ -28,7 +31,7 @@ main (int argc, char* argv[]) try { - auto_ptr<database> db (create_database (argc, argv)); + unique_ptr<database> db (create_database (argc, argv)); for (unsigned short i (0); i < 2; ++i) { @@ -73,17 +76,6 @@ main (int argc, char* argv[]) med.cl.push_back (comp (123, "aaa")); med.cl.push_back (comp (234, "bbbb")); - // linked list - // - med.sll.push_back ("aaa"); - med.sll.push_back ("bbbb"); - - med.nll.push_back (123); - med.nll.push_back (234); - - med.cll.push_back (comp (123, "aaa")); - med.cll.push_back (comp (234, "bbbb")); - // set // med.ns.insert (123); @@ -184,20 +176,6 @@ main (int argc, char* argv[]) full.cl.push_back (comp (2345, "bbbbb")); full.cl.push_back (comp (3456, "cccccc")); - // linked list - // - full.sll.push_back ("aaaa"); - full.sll.push_back ("bbbbb"); - full.sll.push_back ("cccccc"); - - full.nll.push_back (1234); - full.nll.push_back (2345); - full.nll.push_back (3456); - - full.cll.push_back (comp (1234, "aaaa")); - full.cll.push_back (comp (2345, "bbbbb")); - full.cll.push_back (comp (3456, "cccccc")); - // set // full.ns.insert (1234); @@ -288,9 +266,9 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> e (db->load<object> ("empty")); - auto_ptr<object> m (db->load<object> ("medium")); - auto_ptr<object> f (db->load<object> ("full")); + unique_ptr<object> e (db->load<object> ("empty")); + unique_ptr<object> m (db->load<object> ("medium")); + unique_ptr<object> f (db->load<object> ("full")); t.commit (); assert (empty == *e); @@ -318,12 +296,6 @@ main (int argc, char* argv[]) empty.nl.push_back (12); empty.cl.push_back (comp (12, "aa")); - // linked list - // - empty.nll.push_back (12); - empty.sll.push_back ("aa"); - empty.cll.push_back (comp (12, "aa")); - // set // empty.ns.insert (12); @@ -386,12 +358,6 @@ main (int argc, char* argv[]) med.nl.clear (); med.cl.clear (); - // linked list - // - med.nll.clear (); - med.sll.clear (); - med.cll.clear (); - // set // med.ns.clear (); @@ -457,18 +423,6 @@ main (int argc, char* argv[]) full.cl.back ().str += "c"; full.cl.push_back (comp (4567, "ddddddd")); - // linked list - // - full.sll.back () += "c"; - full.sll.push_back ("ddddddd"); - - full.nll.back ()++; - full.nll.push_back (4567); - - full.cll.back ().num++; - full.cll.back ().str += "c"; - full.cll.push_back (comp (4567, "ddddddd")); - // set // full.ns.insert (4567); @@ -539,9 +493,9 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> e (db->load<object> ("empty")); - auto_ptr<object> m (db->load<object> ("medium")); - auto_ptr<object> f (db->load<object> ("full")); + unique_ptr<object> e (db->load<object> ("empty")); + unique_ptr<object> m (db->load<object> ("medium")); + unique_ptr<object> f (db->load<object> ("full")); t.commit (); assert (empty == *e); diff --git a/odb-tests/qt/common/containers/basics/test.hxx b/odb-tests/qt/common/containers/basics/test.hxx index 2c61c88..6a51a5b 100644 --- a/odb-tests/qt/common/containers/basics/test.hxx +++ b/odb-tests/qt/common/containers/basics/test.hxx @@ -7,7 +7,6 @@ #include <QtCore/QString> #include <QtCore/QVector> #include <QtCore/QList> -#include <QtCore/QLinkedList> #include <QtCore/QSet> #include <QtCore/QMap> #include <QtCore/QMultiMap> @@ -19,7 +18,7 @@ #pragma db value struct comp { - comp () {} + comp (): num (0) {} comp (int n, const QString& s) : num (n), str (s) {} #pragma db column("number") @@ -47,10 +46,6 @@ typedef QList<int> num_list; typedef QList<QString> str_list; typedef QList<comp> comp_list; -typedef QLinkedList<int> num_linked_list; -typedef QLinkedList<QString> str_linked_list; -typedef QLinkedList<comp> comp_linked_list; - typedef QSet<int> num_set; typedef QSet<QString> str_set; @@ -125,12 +120,6 @@ struct object num_list nl; comp_list cl; - // linked list - // - str_linked_list sll; - num_linked_list nll; - comp_linked_list cll; - // set // num_set ns; @@ -194,10 +183,6 @@ operator== (const object& x, const object& y) x.nl == y.nl && x.cl == y.cl && - x.nll == y.nll && - x.sll == y.sll && - x.cll == y.cll && - x.ns == y.ns && x.ss == y.ss && diff --git a/odb-tests/qt/common/containers/basics/testscript b/odb-tests/qt/common/containers/basics/testscript new file mode 100644 index 0000000..bdb2d08 --- /dev/null +++ b/odb-tests/qt/common/containers/basics/testscript @@ -0,0 +1,53 @@ +# file : qt/common/containers/basics/testscript +# license : GNU GPL v2; see accompanying LICENSE file + +.include ../../../../database-options.testscript + +: mysql +: +if $mysql +{ + .include ../../../../mysql.testscript + + $create_schema + $* +} + +: sqlite +: +if $sqlite +{ + .include ../../../../sqlite.testscript + + $* +} + +: pgsql +: +if $pgsql +{ + .include ../../../../pgsql.testscript + + $create_schema + $* +} + +: oracle +: +if $oracle +{ + .include ../../../../oracle.testscript + + $create_schema + $* +} + +: mssql +: +if $mssql +{ + .include ../../../../mssql.testscript + + $create_schema + $* +} diff --git a/odb-tests/qt/common/containers/change-tracking/buildfile b/odb-tests/qt/common/containers/change-tracking/buildfile new file mode 100644 index 0000000..92cc878 --- /dev/null +++ b/odb-tests/qt/common/containers/change-tracking/buildfile @@ -0,0 +1,51 @@ +# file : qt/common/containers/change-tracking/buildfile +# license : GNU GPL v2; see accompanying LICENSE file + +if ($build.meta_operation != 'dist') +{ + assert ($qt) \ + "Qt version should be configured for this test via config.odb_tests.qt variable" +} + +import meta_libs = libodb%lib{odb} +import meta_libs += libodb-qt%lib{odb-qt} +import meta_libs += "libQt$(qt_ver)Core"%lib{"Qt$(qt_ver)Core"} + +libs = + +for db: $databases + import libs += libodb-$db%lib{odb-$db} + +import libs += lib{common} + +exe{driver}: {hxx cxx}{* -test-odb -test-odb-*} {hxx ixx cxx}{test-odb} testscript + +# Introduce the metadata library target to make sure the libodb library is +# resolved for the odb_compile ad hoc rule (see build/root.build for details). +# +libue{test-meta}: $meta_libs + +<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta} + +for db: $databases +{ + exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi + <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta} +} + +exe{driver}: libue{test-meta} $libs + +# Specify the ODB custom options to be used by the odb_compile ad hoc rule +# (see build/root.build for details). +# +odb_options = --std ($qt_ver == 5 ? c++11 : c++17) \ + --table-prefix qt_cont_ct_ \ + --profile qt/containers \ + --profile qt/basic \ + --generate-schema + +cxx.poptions =+ "-I$out_base" "-I$src_base" + +# Testscript's run-time prerequisites. +# +exe{driver}: ../../../../alias{database-client}: include = adhoc diff --git a/odb-tests/qt/common/containers/change-tracking/driver.cxx b/odb-tests/qt/common/containers/change-tracking/driver.cxx index 8157d96..f2e4179 100644 --- a/odb-tests/qt/common/containers/change-tracking/driver.cxx +++ b/odb-tests/qt/common/containers/change-tracking/driver.cxx @@ -4,15 +4,11 @@ // Test change-tracking Qt containers. // -#include <common/config.hxx> // HAVE_CXX11 - -#include <memory> // std::auto_ptr +#include <memory> // std::unique_ptr +#include <utility> // std::move #include <cassert> #include <iostream> -#ifdef HAVE_CXX11 -# include <utility> // std::move -#endif #include <QtCore/QtGlobal> // QT_VERSION, Q_FOREACH #include <QtCore/QCoreApplication> @@ -24,11 +20,14 @@ #include <odb/qt/list-iterator.hxx> #include <odb/qt/mutable-list-iterator.hxx> -#include <common/common.hxx> +#include <libcommon/common.hxx> #include "test.hxx" #include "test-odb.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace odb::core; @@ -115,7 +114,7 @@ main (int argc, char* argv[]) cerr << i; } - auto_ptr<database> db (create_database (argc, argv)); + unique_ptr<database> db (create_database (argc, argv)); // Test traits logic. // @@ -140,11 +139,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); -#ifdef HAVE_CXX11 unique_ptr<object> p (db->load<object> ("1")); -#else - auto_ptr<object> p (db->load<object> ("1")); -#endif assert (p->s._tracking ()); t.commit (); } @@ -532,12 +527,7 @@ main (int argc, char* argv[]) // { -#ifdef HAVE_CXX11 unique_ptr<object> c; -#else - auto_ptr<object> c; -#endif - { o.s.pop_back (); @@ -602,7 +592,6 @@ main (int argc, char* argv[]) // Armed move. // -#ifdef HAVE_CXX11 { unique_ptr<object> c; @@ -633,7 +622,6 @@ main (int argc, char* argv[]) t.commit (); } } -#endif } catch (const odb::exception& e) { diff --git a/odb-tests/qt/common/containers/change-tracking/test.hxx b/odb-tests/qt/common/containers/change-tracking/test.hxx index 6067581..1548dcc 100644 --- a/odb-tests/qt/common/containers/change-tracking/test.hxx +++ b/odb-tests/qt/common/containers/change-tracking/test.hxx @@ -4,33 +4,22 @@ #ifndef TEST_HXX #define TEST_HXX -#include <common/config.hxx> // HAVE_CXX11 - #include <memory> - -#ifdef HAVE_CXX11 -# include <utility> // std::move -#endif +#include <utility> // std::move #include <QtCore/QString> #include <odb/core.hxx> #include <odb/qt/list.hxx> -#ifdef HAVE_CXX11 #pragma db object pointer(std::unique_ptr) -#else -#pragma db object pointer(std::auto_ptr) -#endif struct object { object () {} object (const QString& id): id_ (id) {} -#ifdef HAVE_CXX11 object (const object& x): id_ (x.id_), i (x.i), s (x.s) {} object (object&& x): id_ (std::move (x.id_)), i (x.i), s (std::move (x.s)) {} -#endif #pragma db id QString id_; @@ -40,7 +29,10 @@ struct object QOdbList<QString> s; inline bool - operator== (const object& o) {return id_ == o.id_ && i == o.i && s == o.s;} + operator== (const object& o) const + { + return id_ == o.id_ && i == o.i && s == o.s; + } }; #endif // TEST_HXX diff --git a/odb-tests/qt/common/containers/change-tracking/testscript b/odb-tests/qt/common/containers/change-tracking/testscript new file mode 100644 index 0000000..c026f63 --- /dev/null +++ b/odb-tests/qt/common/containers/change-tracking/testscript @@ -0,0 +1,53 @@ +# file : qt/common/containers/change-tracking/testscript +# license : GNU GPL v2; see accompanying LICENSE file + +.include ../../../../database-options.testscript + +: mysql +: +if $mysql +{ + .include ../../../../mysql.testscript + + $create_schema + $* +} + +: sqlite +: +if $sqlite +{ + .include ../../../../sqlite.testscript + + $* +} + +: pgsql +: +if $pgsql +{ + .include ../../../../pgsql.testscript + + $create_schema + $* +} + +: oracle +: +if $oracle +{ + .include ../../../../oracle.testscript + + $create_schema + $* +} + +: mssql +: +if $mssql +{ + .include ../../../../mssql.testscript + + $create_schema + $* +} |