mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-05-07 00:59:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests used real types instead of auto

Browse Source
This commit is contained in:
silverqx
2023-05-17 19:23:49 +02:00
parent ec77eaae32
commit 0b2c435a2f
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp
+15 -8
View File
@@ -39,7 +39,7 @@ private Q_SLOTS:
void initTestCase();
void cleanupTestCase() const;
/* Others */
/* Comparison operators */
void equalComparison() const;
void notEqualComparison() const;
@@ -193,7 +193,10 @@ void tst_Collection_Models::cleanupTestCase() const
ConnectionOverride::connection.clear();
}
/* Others */
/* Comparison operators */
/* In the following equality operator==() tests are real types used instead
of the auto to clearly see what's up. */
void tst_Collection_Models::equalComparison() const
{
@@ -211,7 +214,7 @@ void tst_Collection_Models::equalComparison() const
QVERIFY(images2_1 == images2_2);
// The same models' addresses (used Models' pointers comparison)
const auto &images2_3 = images2_1;
const ModelsCollection<AlbumImage> &images2_3 = images2_1;
QVERIFY(images2_1 == images2_3);
}
@@ -240,12 +243,14 @@ void tst_Collection_Models::notEqualComparison() const
void tst_Collection_Models::equalComparison_WithPointersCollection() const
{
auto images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
ModelsCollection<AlbumImage>
images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
auto images2_2 = AlbumImage::whereEq(Common::album_id, 2)->get();
ModelsCollection<AlbumImage>
images2_2 = AlbumImage::whereEq(Common::album_id, 2)->get();
QCOMPARE(images2_2.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images2_2));
QVERIFY(Common::verifyIds(images2_2, {2, 3, 4, 5, 6}));
@@ -266,12 +271,14 @@ void tst_Collection_Models::equalComparison_WithPointersCollection() const
void tst_Collection_Models::notEqualComparison_WithPointersCollection() const
{
auto images1 = AlbumImage::whereEq(Common::album_id, 1)->get();
ModelsCollection<AlbumImage>
images1 = AlbumImage::whereEq(Common::album_id, 1)->get();
QCOMPARE(images1.size(), 1);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images1));
QVERIFY(Common::verifyIds(images1, {1}));
auto images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
ModelsCollection<AlbumImage>
images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
@@ -283,7 +290,7 @@ void tst_Collection_Models::notEqualComparison_WithPointersCollection() const
QVERIFY(images1 != images2_1_Init);
// Make a copy and change one model (used Model::operator==() for comparing)
auto images2_2 = images2_1;
ModelsCollection<AlbumImage> images2_2 = images2_1;
ModelsCollection<AlbumImage *> images2_2_Init {
&images2_2[0], &images2_2[1], &images2_2[2], &images2_2[3], &images2_2[4], // NOLINT(readability-container-data-pointer)
};
tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp
+26 -13
View File
@@ -39,7 +39,7 @@ private Q_SLOTS:
void initTestCase();
void cleanupTestCase() const;
/* Others */
/* Comparison operators */
void equalComparison() const;
void notEqualComparison() const;
@@ -192,7 +192,10 @@ void tst_Collection_Relations::cleanupTestCase() const
ConnectionOverride::connection.clear();
}
/* Others */
/* Comparison operators */
/* In the following equality operator==() tests are real types used instead
of the auto to clearly see what's up. */
void tst_Collection_Relations::equalComparison() const
{
@@ -201,7 +204,8 @@ void tst_Collection_Relations::equalComparison() const
QVERIFY(album2_1->exists);
QCOMPARE(album2_1->getAttribute(ID), QVariant(2));
auto images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
@@ -211,7 +215,8 @@ void tst_Collection_Relations::equalComparison() const
QVERIFY(album2_2->exists);
QCOMPARE(album2_2->getAttribute(ID), QVariant(2));
auto images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_2.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_2));
QVERIFY(Common::verifyIds(images2_2, {2, 3, 4, 5, 6}));
@@ -220,7 +225,7 @@ void tst_Collection_Relations::equalComparison() const
QVERIFY(images2_1 == images2_2);
// The same models' addresses (used Models' pointers comparison)
const auto &images2_3 = images2_1;
const ModelsCollection<AlbumImage *> &images2_3 = images2_1;
QVERIFY(images2_1 == images2_3);
}
@@ -231,7 +236,8 @@ void tst_Collection_Relations::notEqualComparison() const
QVERIFY(album1->exists);
QCOMPARE(album1->getAttribute(ID), QVariant(1));
auto images1 = album1->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images1 = album1->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images1.size(), 1);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images1));
QVERIFY(Common::verifyIds(images1, {1}));
@@ -241,7 +247,8 @@ void tst_Collection_Relations::notEqualComparison() const
QVERIFY(album2_1->exists);
QCOMPARE(album2_1->getAttribute(ID), QVariant(2));
auto images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
@@ -255,7 +262,8 @@ void tst_Collection_Relations::notEqualComparison() const
QVERIFY(album2_2->exists);
QCOMPARE(album2_2->getAttribute(ID), QVariant(2));
auto images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_2.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_2));
QVERIFY(Common::verifyIds(images2_2, {2, 3, 4, 5, 6}));
@@ -272,12 +280,14 @@ void tst_Collection_Relations::equalComparison_WithModelsCollection() const
QVERIFY(album2_1->exists);
QCOMPARE(album2_1->getAttribute(ID), QVariant(2));
auto images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_1 = album2_1->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
auto images2_2 = AlbumImage::whereEq(Common::album_id, 2)->get();
ModelsCollection<AlbumImage>
images2_2 = AlbumImage::whereEq(Common::album_id, 2)->get();
QCOMPARE(images2_2.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images2_2));
QVERIFY(Common::verifyIds(images2_2, {2, 3, 4, 5, 6}));
@@ -305,12 +315,14 @@ void tst_Collection_Relations::notEqualComparison_WithModelsCollection() const
QVERIFY(album1->exists);
QCOMPARE(album1->getAttribute(ID), QVariant(1));
auto images1 = album1->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images1 = album1->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images1.size(), 1);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images1));
QVERIFY(Common::verifyIds(images1, {1}));
auto images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
ModelsCollection<AlbumImage>
images2_1 = AlbumImage::whereEq(Common::album_id, 2)->get();
QCOMPARE(images2_1.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage>), typeid (images2_1));
QVERIFY(Common::verifyIds(images2_1, {2, 3, 4, 5, 6}));
@@ -324,7 +336,8 @@ void tst_Collection_Relations::notEqualComparison_WithModelsCollection() const
QVERIFY(album2_2->exists);
QCOMPARE(album2_2->getAttribute(ID), QVariant(2));
auto images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
ModelsCollection<AlbumImage *>
images2_2 = album2_2->getRelation<AlbumImage>(Common::albumImages);
QCOMPARE(images2_2.size(), 5);
QCOMPARE(typeid (ModelsCollection<AlbumImage *>), typeid (images2_2));
QVERIFY(Common::verifyIds(images2_2, {2, 3, 4, 5, 6}));