diff --git a/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp b/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp index fd5c2e37a..9466a5706 100644 --- a/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp +++ b/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp @@ -7,6 +7,7 @@ #include "orm/db.hpp" #include "orm/exceptions/invalidargumenterror.hpp" #include "orm/query/querybuilder.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -27,6 +28,7 @@ using Orm::Query::Builder; using QueryBuilder = Orm::Query::Builder; using QueryUtils = Orm::Utils::Query; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -119,7 +121,7 @@ void tst_QueryBuilder::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_QueryBuilder") + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/functional/orm/tiny/model/tst_model.cpp b/tests/auto/functional/orm/tiny/model/tst_model.cpp index 5d7adbd6a..70f04d86d 100644 --- a/tests/auto/functional/orm/tiny/model/tst_model.cpp +++ b/tests/auto/functional/orm/tiny/model/tst_model.cpp @@ -27,6 +27,7 @@ using Orm::Tiny::ConnectionOverride; using Orm::Tiny::Exceptions::ModelNotFoundError; using QueryUtils = Orm::Utils::Query; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -124,7 +125,8 @@ void tst_Model::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_Model").toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) + .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp index 5e3323445..e5a442c09 100644 --- a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp +++ b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp @@ -24,6 +24,8 @@ using Orm::Exceptions::RecordsNotFoundError; using Orm::Tiny::ConnectionOverride; using Orm::Tiny::Exceptions::MassAssignmentError; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; using Models::FilePropertyProperty; @@ -132,7 +134,7 @@ void tst_Model_Connection_Independent::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_Model_Connection_Independent", Databases::MYSQL) + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) .toUtf8().constData(), ); } diff --git a/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp b/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp index 66e0e65f5..589c647b4 100644 --- a/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp +++ b/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp @@ -38,6 +38,7 @@ using Orm::Tiny::Relations::Relation; using Orm::Tiny::TinyBuilder; using QueryUtils = Orm::Utils::Query; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -226,7 +227,7 @@ void tst_Model_Relations::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_Model_Relations") + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp b/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp index 6cbc23469..820c726d4 100644 --- a/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp +++ b/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp @@ -9,6 +9,8 @@ using Orm::Constants::EMPTY; using Orm::Tiny::ConnectionOverride; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; using Models::Phone; @@ -45,7 +47,7 @@ void tst_Relations_Connection_Independent::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_Relations_Connection_Independent", Databases::MYSQL) + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) .toUtf8().constData(), ); } diff --git a/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp b/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp index 445cfec75..21865b157 100644 --- a/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp +++ b/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp @@ -21,6 +21,8 @@ using Orm::One; using Orm::Tiny::AttributeItem; using Orm::Tiny::ConnectionOverride; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; using Models::Tag; @@ -112,7 +114,7 @@ void tst_Relations_Inserting_Updating::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_Relations_Inserting_Updating") + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp index 4258f4d00..538d44605 100644 --- a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp +++ b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp @@ -17,6 +17,7 @@ using Orm::Tiny::Exceptions::ModelNotFoundError; template using TinyBuilder = Orm::Tiny::Builder; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -56,7 +57,7 @@ void tst_TinyBuilder::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_TinyBuilder") + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/functional/tom/migrate/tst_migrate.cpp b/tests/auto/functional/tom/migrate/tst_migrate.cpp index 53cbc03cb..5628d7efa 100644 --- a/tests/auto/functional/tom/migrate/tst_migrate.cpp +++ b/tests/auto/functional/tom/migrate/tst_migrate.cpp @@ -1,6 +1,8 @@ #include #include +#include "orm/utils/type.hpp" + #include "tom/application.hpp" #include "tom/commands/migrations/statuscommand.hpp" @@ -11,6 +13,8 @@ #include "migrations/2014_10_12_200000_create_properties_table.hpp" #include "migrations/2014_10_12_300000_create_phones_table.hpp" +using TypeUtils = Orm::Utils::Type; + using TomApplication = Tom::Application; using Tom::Commands::Migrations::StatusCommand; @@ -142,7 +146,8 @@ void tst_Migrate::initTestCase() Databases::createConnections({Databases::MYSQL, Databases::POSTGRESQL}); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_Migrate").toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) + .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp b/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp index 1637fa374..932c09b61 100644 --- a/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp +++ b/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp @@ -5,6 +5,7 @@ #include "orm/db.hpp" #include "orm/mysqlconnection.hpp" #include "orm/query/querybuilder.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -16,6 +17,7 @@ using Orm::DB; using Orm::MySqlConnection; using QueryBuilder = Orm::Query::Builder; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -53,7 +55,7 @@ void tst_DatabaseConnection::initTestCase_data() const const auto &connections = Databases::createConnections(); if (connections.isEmpty()) - QSKIP(TestUtils::AutoTestSkippedAny.arg("tst_DatabaseConnection") + QSKIP(TestUtils::AutoTestSkippedAny.arg(TypeUtils::classPureBasename(*this)) .toUtf8().constData(), ); QTest::addColumn("connection"); diff --git a/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp b/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp index 12aceb000..88fad8bce 100644 --- a/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp +++ b/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp @@ -7,6 +7,7 @@ #include "orm/exceptions/recordsnotfounderror.hpp" #include "orm/mysqlconnection.hpp" #include "orm/query/querybuilder.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -33,6 +34,7 @@ using Orm::Query::Expression; using QueryBuilder = Orm::Query::Builder; using Raw = Orm::Query::Expression; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -248,8 +250,9 @@ void tst_MySql_QueryBuilder::initTestCase() m_connection = Databases::createConnection(Databases::MYSQL); if (m_connection.isEmpty()) - QSKIP(TestUtils::AutoTestSkipped.arg("tst_MySql_QueryBuilder", Databases::MYSQL) - .toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkipped + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) + .toUtf8().constData(), ); } void tst_MySql_QueryBuilder::version() const diff --git a/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp b/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp index 66dee4591..3d2108d6d 100644 --- a/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp +++ b/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp @@ -3,6 +3,7 @@ #include "orm/db.hpp" #include "orm/query/querybuilder.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -21,6 +22,7 @@ using Orm::Query::Expression; using QueryBuilder = Orm::Query::Builder; using Raw = Orm::Query::Expression; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -147,7 +149,7 @@ void tst_PostgreSQL_QueryBuilder::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_PostgreSQL_QueryBuilder", Databases::POSTGRESQL) + .arg(TypeUtils::classPureBasename(*this), Databases::POSTGRESQL) .toUtf8().constData(), ); } diff --git a/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp b/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp index d79ea251b..7f93e8bc8 100644 --- a/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp +++ b/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp @@ -3,6 +3,7 @@ #include "orm/db.hpp" #include "orm/query/querybuilder.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -21,6 +22,7 @@ using Orm::Query::Expression; using QueryBuilder = Orm::Query::Builder; using Raw = Orm::Query::Expression; +using TypeUtils = Orm::Utils::Type; using TestUtils::Databases; @@ -146,7 +148,7 @@ void tst_SQLite_QueryBuilder::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_SQLite_QueryBuilder", Databases::SQLITE) + .arg(TypeUtils::classPureBasename(*this), Databases::SQLITE) .toUtf8().constData(), ); } diff --git a/tests/auto/unit/orm/schema/blueprint/tst_blueprint.cpp b/tests/auto/unit/orm/schema/blueprint/tst_blueprint.cpp index 1c59ace16..c9e8f8af0 100644 --- a/tests/auto/unit/orm/schema/blueprint/tst_blueprint.cpp +++ b/tests/auto/unit/orm/schema/blueprint/tst_blueprint.cpp @@ -3,6 +3,7 @@ #include "orm/db.hpp" #include "orm/schema/grammars/mysqlschemagrammar.hpp" +#include "orm/utils/type.hpp" #include "databases.hpp" @@ -15,6 +16,8 @@ using Orm::SchemaNs::Blueprint; using Orm::SchemaNs::IndexCommand; using Orm::SchemaNs::Grammars::MySqlSchemaGrammar; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; class tst_Blueprint : public QObject // clazy:exclude=ctor-missing-parent-argument @@ -47,8 +50,9 @@ void tst_Blueprint::initTestCase() m_connection = Databases::createConnection(Databases::MYSQL); if (m_connection.isEmpty()) - QSKIP(TestUtils::AutoTestSkipped.arg("tst_Blueprint", Databases::MYSQL) - .toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkipped + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) + .toUtf8().constData(), ); } void tst_Blueprint::index_DefaultNames() const diff --git a/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp b/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp index 8b6f9c854..c0349c90d 100644 --- a/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp +++ b/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp @@ -28,6 +28,8 @@ using Orm::SchemaNs::Blueprint; using Orm::SchemaNs::Constants::Cascade; using Orm::SchemaNs::Constants::Restrict; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; class tst_MySql_SchemaBuilder : public QObject // clazy:exclude=ctor-missing-parent-argument @@ -112,8 +114,9 @@ void tst_MySql_SchemaBuilder::initTestCase() m_connection = Databases::createConnection(Databases::MYSQL); if (m_connection.isEmpty()) - QSKIP(TestUtils::AutoTestSkipped.arg("tst_MySql_SchemaBuilder", Databases::MYSQL) - .toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkipped + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) + .toUtf8().constData(), ); } void tst_MySql_SchemaBuilder::createDatabase() const diff --git a/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp b/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp index b6b763859..22168f85d 100644 --- a/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp +++ b/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp @@ -28,6 +28,8 @@ using Orm::SchemaNs::Blueprint; using Orm::SchemaNs::Constants::Cascade; using Orm::SchemaNs::Constants::Restrict; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; class tst_PostgreSQL_SchemaBuilder : public QObject // clazy:exclude=ctor-missing-parent-argument @@ -113,7 +115,7 @@ void tst_PostgreSQL_SchemaBuilder::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_PostgreSQL_SchemaBuilder", Databases::POSTGRESQL) + .arg(TypeUtils::classPureBasename(*this), Databases::POSTGRESQL) .toUtf8().constData(), ); } diff --git a/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp b/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp index 0c959f9d7..48d5f1b6f 100644 --- a/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp +++ b/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp @@ -33,6 +33,8 @@ using Orm::SchemaNs::Constants::Cascade; using Orm::SchemaNs::Constants::Restrict; using Orm::SchemaNs::Grammars::SQLiteSchemaGrammar; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; class tst_SQLite_SchemaBuilder : public QObject // clazy:exclude=ctor-missing-parent-argument @@ -132,7 +134,7 @@ void tst_SQLite_SchemaBuilder::initTestCase() if (m_connection.isEmpty()) QSKIP(TestUtils::AutoTestSkipped - .arg("tst_SQLite_SchemaBuilder", Databases::SQLITE) + .arg(TypeUtils::classPureBasename(*this), Databases::SQLITE) .toUtf8().constData(), ); } diff --git a/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp b/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp index 0e0ebaf4b..2946cfe36 100644 --- a/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp +++ b/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp @@ -16,6 +16,8 @@ using Orm::Exceptions::InvalidArgumentError; using Orm::QueryBuilder; using Orm::Tiny::TinyBuilder; +using TypeUtils = Orm::Utils::Type; + using TestUtils::Databases; using Models::FilePropertyProperty; @@ -93,8 +95,9 @@ void tst_MySql_TinyBuilder::initTestCase() m_connection = Databases::createConnection(Databases::MYSQL); if (m_connection.isEmpty()) - QSKIP(TestUtils::AutoTestSkipped.arg("tst_MySql_TinyBuilder", Databases::MYSQL) - .toUtf8().constData(), ); + QSKIP(TestUtils::AutoTestSkipped + .arg(TypeUtils::classPureBasename(*this), Databases::MYSQL) + .toUtf8().constData(), ); } void tst_MySql_TinyBuilder::has_Basic_OnHasMany() const