feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Various tests: Replace QVector by QList

Browse Source 
Change-Id: I3d7d8233da2402229e56ceef387c3df9effecd20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2025-04-09 12:58:46 +02:00
parent 5d1144c819
commit e29d440a47
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/algorithm/tst_algorithm.cpp
View File

@@ -238,9 +238,9 @@ void tst_Algorithm::transform()
QCOMPARE(trans, QList<double>({1.5, 7.5, 17.5})); QCOMPARE(trans, QList<double>({1.5, 7.5, 17.5}));
} }
{ {
// specific result container with one template parameter (QVector) // specific result container with one template parameter (QList)
std::vector<int> v({1, 2, 3, 4}); std::vector<int> v({1, 2, 3, 4});
const QVector<BaseStruct *> trans = Utils::transform<QVector<BaseStruct *>>(v, [](int i) { const QList<BaseStruct *> trans = Utils::transform<QList<BaseStruct *>>(v, [](int i) {
return new Struct(i); return new Struct(i);
}); });
QCOMPARE(trans.size(), 4); QCOMPARE(trans.size(), 4);
@@ -279,14 +279,14 @@ void tst_Algorithm::transform()
{ {
// specific result container with member function // specific result container with member function
QList<Struct> v({1, 2, 3, 4}); QList<Struct> v({1, 2, 3, 4});
const QVector<double> trans = Utils::transform<QVector<double>>(v, &Struct::getMember); const QList<double> trans = Utils::transform<QList<double>>(v, &Struct::getMember);
QCOMPARE(trans, QVector<double>({1.0, 2.0, 3.0, 4.0})); QCOMPARE(trans, QList<double>({1.0, 2.0, 3.0, 4.0}));
} }
{ {
// specific result container with member // specific result container with member
QList<Struct> v({1, 2, 3, 4}); QList<Struct> v({1, 2, 3, 4});
const QVector<double> trans = Utils::transform<QVector<double>>(v, &Struct::member); const QList<double> trans = Utils::transform<QList<double>>(v, &Struct::member);
QCOMPARE(trans, QVector<double>({1.0, 2.0, 3.0, 4.0})); QCOMPARE(trans, QList<double>({1.0, 2.0, 3.0, 4.0}));
} }
{ {
// non-const container and function parameter // non-const container and function parameter
@@ -295,7 +295,7 @@ void tst_Algorithm::transform()
const std::vector<std::reference_wrapper<Struct>> trans const std::vector<std::reference_wrapper<Struct>> trans
= Utils::transform(v, [](Struct &s) { return std::ref(s); }); = Utils::transform(v, [](Struct &s) { return std::ref(s); });
// different container type // different container type
QVector<Struct> v2({1, 2, 3, 4}); QList<Struct> v2({1, 2, 3, 4});
const std::vector<std::reference_wrapper<Struct>> trans2 const std::vector<std::reference_wrapper<Struct>> trans2
= Utils::transform<std::vector>(v, [](Struct &s) { return std::ref(s); }); = Utils::transform<std::vector>(v, [](Struct &s) { return std::ref(s); });
// temporaries // temporaries

9
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -141,8 +141,7 @@ public:
int /*utf16charsOffset*/, int /*utf16charsOffset*/,
int line, int line,
const Macro &macro, const Macro &macro,
const QVector<MacroArgumentReference> &actuals const QList<MacroArgumentReference> &actuals = {}) override
= QVector<MacroArgumentReference>()) override
{ {
m_expandedMacros.append(macro.name()); m_expandedMacros.append(macro.name());
m_expandedMacrosOffset.append(bytesOffset); m_expandedMacrosOffset.append(bytesOffset);
@@ -266,7 +265,7 @@ public:
const QList<int> macroArgsCount() const const QList<int> macroArgsCount() const
{ return m_macroArgsCount; } { return m_macroArgsCount; }
const QMap<QByteArray, QVector<MacroArgumentReference >> usedMacros() const const QMap<QByteArray, QList<MacroArgumentReference >> usedMacros() const
{ return m_usedMacros; } { return m_usedMacros; }
const QList<Pragma> &pragmas() const { return m_pragmas; } const QList<Pragma> &pragmas() const { return m_pragmas; }
@@ -288,7 +287,7 @@ private:
QHash<QByteArray, QList<int> > m_definitionsResolvedFromLines; QHash<QByteArray, QList<int> > m_definitionsResolvedFromLines;
QSet<QByteArray> m_unresolvedDefines; QSet<QByteArray> m_unresolvedDefines;
QList<int> m_macroArgsCount; QList<int> m_macroArgsCount;
QMap<QByteArray, QVector<MacroArgumentReference >> m_usedMacros; QMap<QByteArray, QList<MacroArgumentReference >> m_usedMacros;
QList<Pragma> m_pragmas; QList<Pragma> m_pragmas;
}; };
@@ -539,7 +538,7 @@ void tst_Preprocessor::macro_args_offsets()
Preprocessor preprocess(&client, &env); Preprocessor preprocess(&client, &env);
preprocess.run(fileName, source, true, false); preprocess.run(fileName, source, true, false);
QMap<QByteArray, QVector<MacroArgumentReference >> usedMacros = client.usedMacros(); QMap<QByteArray, QList<MacroArgumentReference>> usedMacros = client.usedMacros();
QCOMPARE(usedMacros.size(), 1); QCOMPARE(usedMacros.size(), 1);
QVERIFY(usedMacros.contains(macroName)); QVERIFY(usedMacros.contains(macroName));
MacroArgumentReference argRef = usedMacros.value(macroName).at(0); MacroArgumentReference argRef = usedMacros.value(macroName).at(0);

4
tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
View File

@@ -204,11 +204,11 @@ void tst_PointerAlgorithm::toRawPointer()
const std::vector<Struct *> x1 = Utils::toRawPointer(v); const std::vector<Struct *> x1 = Utils::toRawPointer(v);
// different result container // different result container
const std::vector<Struct *> x2 = Utils::toRawPointer<std::vector>(v); const std::vector<Struct *> x2 = Utils::toRawPointer<std::vector>(v);
const QVector<Struct *> x3 = Utils::toRawPointer<QVector>(v); const QList<Struct *> x3 = Utils::toRawPointer<QList>(v);
const std::list<Struct *> x4 = Utils::toRawPointer<std::list>(v); const std::list<Struct *> x4 = Utils::toRawPointer<std::list>(v);
// different fully specified result container // different fully specified result container
const std::vector<BaseStruct *> x5 = Utils::toRawPointer<std::vector<BaseStruct *>>(v); const std::vector<BaseStruct *> x5 = Utils::toRawPointer<std::vector<BaseStruct *>>(v);
const QVector<BaseStruct *> x6 = Utils::toRawPointer<QVector<BaseStruct *>>(v); const QList<BaseStruct *> x6 = Utils::toRawPointer<QList<BaseStruct *>>(v);
} }
void tst_PointerAlgorithm::toReferences() void tst_PointerAlgorithm::toReferences()