From 989fca660c3556fa957ed9a3f7cd3b948a4166a2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 16:15:23 +0200
Subject: Use QList instead of QVector in corelib tests

Task-number: QTBUG-84469
Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../corelib/kernel/qmetatype/tst_qmetatype.cpp     | 79 +++++++++++-----------
 1 file changed, 38 insertions(+), 41 deletions(-)

(limited to 'tests/auto/corelib/kernel/qmetatype')

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 48b46dd98f..8d4cc05eb9 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -66,7 +66,7 @@ public:
     void setProp(const QList<QVariant> &list) { propList = list; }
 
 private:
-    void registerGadget(const char * name, const QVector<GadgetPropertyType> &gadgetProperties);
+    void registerGadget(const char * name, const QList<GadgetPropertyType> &gadgetProperties);
     QList<QVariant> propList;
 
 private slots:
@@ -183,7 +183,7 @@ struct GenericGadgetType : BaseGenericType
         for (auto &prop : properties)
             in >> prop;
     }
-    QVector<QVariant> properties;
+    QList<QVariant> properties;
 };
 
 struct GenericPODType : BaseGenericType
@@ -287,7 +287,7 @@ class GadgetDerivedAndTyped : public CustomGadget {};
 Q_DECLARE_METATYPE(GadgetDerivedAndTyped<int>)
 Q_DECLARE_METATYPE(GadgetDerivedAndTyped<int>*)
 
-void tst_QMetaType::registerGadget(const char *name, const QVector<GadgetPropertyType> &gadgetProperties)
+void tst_QMetaType::registerGadget(const char *name, const QList<GadgetPropertyType> &gadgetProperties)
 {
     QMetaObjectBuilder gadgetBuilder;
     gadgetBuilder.setClassName(name);
@@ -581,13 +581,13 @@ void tst_QMetaType::typeName_data()
     QTest::newRow("124125534") << 124125534 << QString();
 
     // automatic registration
-    QTest::newRow("QHash<int,int>") << ::qMetaTypeId<QHash<int, int> >() << QString::fromLatin1("QHash<int,int>");
-    QTest::newRow("QMap<int,int>") << ::qMetaTypeId<QMap<int, int> >() << QString::fromLatin1("QMap<int,int>");
-    QTest::newRow("QVector<QMap<int,int>>") << ::qMetaTypeId<QVector<QMap<int, int> > >() << QString::fromLatin1("QList<QMap<int,int>>");
+    QTest::newRow("QHash<int,int>") << ::qMetaTypeId<QHash<int, int>>() << QString::fromLatin1("QHash<int,int>");
+    QTest::newRow("QMap<int,int>") << ::qMetaTypeId<QMap<int, int>>() << QString::fromLatin1("QMap<int,int>");
+    QTest::newRow("QList<QMap<int,int>>") << ::qMetaTypeId<QList<QMap<int, int>>>() << QString::fromLatin1("QList<QMap<int,int>>");
 
-    // automatic registration with automatic QList to QVector aliasing
-    QTest::newRow("QList<int>") << ::qMetaTypeId<QList<int> >() << QString::fromLatin1("QList<int>");
-    QTest::newRow("QVector<QList<int>>") << ::qMetaTypeId<QVector<QList<int> > >() << QString::fromLatin1("QList<QList<int>>");
+    // automatic registration with automatic QList to QList aliasing
+    QTest::newRow("QList<int>") << ::qMetaTypeId<QList<int>>() << QString::fromLatin1("QList<int>");
+    QTest::newRow("QList<QList<int>>") << ::qMetaTypeId<QList<QList<int>>>() << QString::fromLatin1("QList<QList<int>>");
 
     QTest::newRow("CustomQObject*") << ::qMetaTypeId<CustomQObject*>() << QString::fromLatin1("CustomQObject*");
     QTest::newRow("CustomGadget") << ::qMetaTypeId<CustomGadget>() << QString::fromLatin1("CustomGadget");
@@ -1109,7 +1109,7 @@ FOR_EACH_CORE_METATYPE(RETURN_CONSTRUCT_FUNCTION)
 
 void tst_QMetaType::typedConstruct()
 {
-    auto testMetaObjectWriteOnGadget = [](QVariant &gadget, const QVector<GadgetPropertyType> &properties)
+    auto testMetaObjectWriteOnGadget = [](QVariant &gadget, const QList<GadgetPropertyType> &properties)
     {
         auto metaObject = QMetaType::metaObjectForType(gadget.userType());
         QVERIFY(metaObject != nullptr);
@@ -1123,7 +1123,7 @@ void tst_QMetaType::typedConstruct()
         }
     };
 
-    auto testMetaObjectReadOnGadget = [](QVariant gadget, const QVector<GadgetPropertyType> &properties)
+    auto testMetaObjectReadOnGadget = [](QVariant gadget, const QList<GadgetPropertyType> &properties)
     {
         auto metaObject = QMetaType::metaObjectForType(gadget.userType());
         QVERIFY(metaObject != nullptr);
@@ -1138,7 +1138,7 @@ void tst_QMetaType::typedConstruct()
         }
     };
 
-    QVector<GadgetPropertyType> dynamicGadget1 = {
+    QList<GadgetPropertyType> dynamicGadget1 = {
         {"int", "int_prop", 34526},
         {"float", "float_prop", 1.23f},
         {"QString", "string_prop", QString{"Test QString"}}
@@ -1150,7 +1150,7 @@ void tst_QMetaType::typedConstruct()
     testMetaObjectReadOnGadget(testGadget1, dynamicGadget1);
 
 
-    QVector<GadgetPropertyType> dynamicGadget2 = {
+    QList<GadgetPropertyType> dynamicGadget2 = {
         {"int", "int_prop", 512},
         {"double", "double_prop", 4.56},
         {"QString", "string_prop", QString{"Another String"}},
@@ -1510,9 +1510,9 @@ void tst_QMetaType::automaticTemplateRegistration()
     CONTAINER<VALUE_TYPE> innerContainer; \
     innerContainer.push_back(42); \
     QVERIFY(*QVariant::fromValue(innerContainer).value<CONTAINER<VALUE_TYPE> >().begin() == 42); \
-    QVector<CONTAINER<VALUE_TYPE> > outerContainer; \
+    QList<CONTAINER<VALUE_TYPE> > outerContainer; \
     outerContainer << innerContainer; \
-    QVERIFY(*QVariant::fromValue(outerContainer).value<QVector<CONTAINER<VALUE_TYPE> > >().first().begin() == 42); \
+    QVERIFY(*QVariant::fromValue(outerContainer).value<QList<CONTAINER<VALUE_TYPE> > >().first().begin() == 42); \
   }
 
   TEST_SEQUENTIAL_CONTAINER(QList, int)
@@ -1524,19 +1524,19 @@ void tst_QMetaType::automaticTemplateRegistration()
     vecbool.push_back(true);
     vecbool.push_back(false);
     vecbool.push_back(true);
-    QVERIFY(QVariant::fromValue(vecbool).value<std::vector<bool> >().front() == true);
-    QVector<std::vector<bool> > vectorList;
+    QVERIFY(QVariant::fromValue(vecbool).value<std::vector<bool>>().front() == true);
+    QList<std::vector<bool>> vectorList;
     vectorList << vecbool;
-    QVERIFY(QVariant::fromValue(vectorList).value<QVector<std::vector<bool> > >().first().front() == true);
+    QVERIFY(QVariant::fromValue(vectorList).value<QList<std::vector<bool>>>().first().front() == true);
   }
 
   {
     QList<unsigned> unsignedList;
     unsignedList << 123;
-    QVERIFY(QVariant::fromValue(unsignedList).value<QList<unsigned> >().first() == 123);
-    QVector<QList<unsigned> > vectorList;
+    QVERIFY(QVariant::fromValue(unsignedList).value<QList<unsigned>>().first() == 123);
+    QList<QList<unsigned>> vectorList;
     vectorList << unsignedList;
-    QVERIFY(QVariant::fromValue(vectorList).value<QVector<QList<unsigned> > >().first().first() == 123);
+    QVERIFY(QVariant::fromValue(vectorList).value<QList<QList<unsigned>>>().first().first() == 123);
   }
 
   QCOMPARE(::qMetaTypeId<QVariantList>(), (int)QMetaType::QVariantList);
@@ -1550,10 +1550,10 @@ void tst_QMetaType::automaticTemplateRegistration()
     QList<QSharedPointer<QObject> > sharedPointerList;
     QObject *testObject = new QObject;
     sharedPointerList << QSharedPointer<QObject>(testObject);
-    QVERIFY(QVariant::fromValue(sharedPointerList).value<QList<QSharedPointer<QObject> > >().first() == testObject);
-    QVector<QList<QSharedPointer<QObject> > > vectorList;
+    QVERIFY(QVariant::fromValue(sharedPointerList).value<QList<QSharedPointer<QObject>>>().first() == testObject);
+    QList<QList<QSharedPointer<QObject>>> vectorList;
     vectorList << sharedPointerList;
-    QVERIFY(QVariant::fromValue(vectorList).value<QVector<QList<QSharedPointer<QObject> > > >().first().first() == testObject);
+    QVERIFY(QVariant::fromValue(vectorList).value<QList<QList<QSharedPointer<QObject>>>>().first().first() == testObject);
   }
   {
     IntIntHash intIntHash;
@@ -1714,9 +1714,6 @@ void tst_QMetaType::automaticTemplateRegistration()
 
     #define FOR_EACH_1ARG_TEMPLATE_TYPE(F, TYPE) \
         F(QList, TYPE) \
-        F(QVector, TYPE) \
-        F(QVector, TYPE) \
-        F(QVector, TYPE) \
         F(QQueue, TYPE) \
         F(QStack, TYPE) \
         F(QSet, TYPE)
@@ -1736,7 +1733,7 @@ void tst_QMetaType::automaticTemplateRegistration()
         FOR_EACH_STATIC_PRIMITIVE_TYPE2(PRINT_2ARG_TEMPLATE_INTERNAL, RealName)
 
     #define REGISTER_TYPEDEF(TYPE, ARG1, ARG2) \
-      qRegisterMetaType<TYPE <ARG1, ARG2> >(#TYPE "<" #ARG1 "," #ARG2 ">");
+      qRegisterMetaType<TYPE <ARG1, ARG2>>(#TYPE "<" #ARG1 "," #ARG2 ">");
 
     REGISTER_TYPEDEF(QHash, int, uint)
     REGISTER_TYPEDEF(QMap, int, uint)
@@ -1749,9 +1746,9 @@ void tst_QMetaType::automaticTemplateRegistration()
       PRINT_2ARG_TEMPLATE
     )
 
-    CREATE_AND_VERIFY_CONTAINER(QList, QList<QMap<int, QHash<char, QList<QVariant> > > >)
-    CREATE_AND_VERIFY_CONTAINER(QVector, void*)
-    CREATE_AND_VERIFY_CONTAINER(QVector, const void*)
+    CREATE_AND_VERIFY_CONTAINER(QList, QList<QMap<int, QHash<char, QList<QVariant>>>>)
+    CREATE_AND_VERIFY_CONTAINER(QList, void*)
+    CREATE_AND_VERIFY_CONTAINER(QList, const void*)
     CREATE_AND_VERIFY_CONTAINER(QList, void*)
     CREATE_AND_VERIFY_CONTAINER(std::pair, void*, void*)
     CREATE_AND_VERIFY_CONTAINER(QHash, void*, void*)
@@ -2548,16 +2545,16 @@ void tst_QMetaType::operatorEq_data()
 
     QTest::newRow("String") << QMetaType(QMetaType::QString)
                             << QMetaType::fromType<const QString &>() << true;
-    QTest::newRow("void1") << QMetaType(QMetaType::UnknownType) << QMetaType::fromType<void>()
-                           << false;
-    QTest::newRow("void2") << QMetaType::fromType<const void>() << QMetaType::fromType<void>()
-                           << true;
-    QTest::newRow("vec1") << QMetaType::fromType<QVector<const int *>>()
-                          << QMetaType::fromType<QVector<const int *>>() << true;
-    QTest::newRow("vec2") << QMetaType::fromType<QVector<const int *>>()
-                          << QMetaType::fromType<QVector<int *>>() << false;
-    QTest::newRow("char1") << QMetaType::fromType<CharTemplate<'>'>>()
-                           << QMetaType::fromType<CharTemplate<'>', void>>() << true;
+    QTest::newRow("void1")  << QMetaType(QMetaType::UnknownType) << QMetaType::fromType<void>()
+                            << false;
+    QTest::newRow("void2")  << QMetaType::fromType<const void>() << QMetaType::fromType<void>()
+                            << true;
+    QTest::newRow("list1")  << QMetaType::fromType<QList<const int *>>()
+                            << QMetaType::fromType<QList<const int *>>() << true;
+    QTest::newRow("list2")  << QMetaType::fromType<QList<const int *>>()
+                            << QMetaType::fromType<QList<int *>>() << false;
+    QTest::newRow("char1")  << QMetaType::fromType<CharTemplate<'>'>>()
+                            << QMetaType::fromType<CharTemplate<'>', void>>() << true;
     QTest::newRow("annon1") << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>()
                             << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>() << true;
     QTest::newRow("annon2") << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>()
-- 
cgit v1.2.3