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

PointerAlgorithm: Fix take and takeDefault

Browse Source 
Fix take unit tests to actually test the correct template instance,
add more unit tests for takeDefault.

Change-Id: I51f5b17b6478a8c1388a91840edfb9c702697b28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-03-15 13:00:05 +01:00
parent 805b28b8b7
commit 3ef6f35cf6
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/pointeralgorithm.h
View File

@@ -275,7 +275,7 @@ auto toRawPointer(const SourceContainer &sources)
// take: // take:
///////////////// /////////////////
template<typename C> template<typename C>
Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, ValueType<C> *p) Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, PointerType<C> p)
{ {
return take(container, [p](const ValueType<C> &v) { return v.get() == p; }); return take(container, [p](const ValueType<C> &v) { return v.get() == p; });
} }
@@ -283,23 +283,23 @@ Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, ValueType<C>
template <typename C> template <typename C>
Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, std::nullptr_t) Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, std::nullptr_t)
{ {
return take(container, static_cast<ValueType<C> *>(nullptr)); return take(container, static_cast<PointerType<C>>(nullptr));
} }
////////////////// //////////////////
// takeOrDefault: // takeOrDefault:
///////////////// /////////////////
template<typename C> template<typename C>
Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, ValueType<C> *p) Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, PointerType<C> p)
{ {
auto result = take(container, [p](const ValueType<C> &v) { return v.get() == p; }); auto result = take(container, [p](const ValueType<C> &v) { return v.get() == p; });
return bool(result) ? result.value() : Utils::make_optional<ValueType<C>>(nullptr); return bool(result) ? std::move(result.value()) : std::move(ValueType<C>());
} }
template <typename C> template <typename C>
Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, std::nullptr_t) Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, std::nullptr_t)
{ {
return takeOrDefault(container, static_cast<ValueType<C> *>(nullptr)); return takeOrDefault(container, static_cast<PointerType<C>>(nullptr));
} }
} // namespace Utils } // namespace Utils

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

@@ -50,6 +50,7 @@ private slots:
void toRawPointer(); void toRawPointer();
void toReferences(); void toReferences();
void take(); void take();
void takeOrDefault();
}; };
@@ -283,25 +284,38 @@ void tst_PointerAlgorithm::toReferences()
void tst_PointerAlgorithm::take() void tst_PointerAlgorithm::take()
{ {
{ {
QList<Struct> v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17}; std::vector<std::unique_ptr<int>> vector;
Utils::optional<Struct> r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); vector.emplace_back(std::make_unique<int>(5));
QVERIFY(static_cast<bool>(r1)); vector.emplace_back(std::make_unique<int>(2));
QCOMPARE(r1.value().member, 13); vector.emplace_back(std::make_unique<int>(6));
Utils::optional<Struct> r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); vector.emplace_back(std::make_unique<int>(7));
QVERIFY(static_cast<bool>(r2)); vector.emplace_back(std::unique_ptr<int>());
QCOMPARE(r2.value().member, 13); std::vector<int *> ptrVector = Utils::toRawPointer(vector);
Utils::optional<Struct> r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); int foo = 42;
QVERIFY(!static_cast<bool>(r3));
Utils::optional<Struct> r4 = Utils::take(v, &Struct::isEven); QVERIFY(Utils::take(vector, ptrVector.at(0)).value().get() == ptrVector.at(0));
QVERIFY(static_cast<bool>(r4)); QVERIFY(Utils::take(vector, ptrVector.at(0)) == Utils::nullopt);
QCOMPARE(r4.value().member, 6); QVERIFY(Utils::take(vector, &foo) == Utils::nullopt);
QVERIFY(Utils::take(vector, nullptr).value().get() == nullptr);
} }
}
void tst_PointerAlgorithm::takeOrDefault()
{
{ {
QList<Struct> v {0, 0, 0, 0, 0, 0, 1, 2, 3}; std::vector<std::unique_ptr<int>> vector;
Utils::optional<Struct> r1 = Utils::take(v, &Struct::member); vector.emplace_back(std::make_unique<int>(5));
QVERIFY(static_cast<bool>(r1)); vector.emplace_back(std::make_unique<int>(2));
QCOMPARE(r1.value().member, 1); vector.emplace_back(std::make_unique<int>(6));
vector.emplace_back(std::make_unique<int>(7));
vector.emplace_back(std::unique_ptr<int>());
std::vector<int *> ptrVector = Utils::toRawPointer(vector);
int foo = 42;
QVERIFY(Utils::takeOrDefault(vector, ptrVector.at(0)).get() == ptrVector.at(0));
QVERIFY(Utils::takeOrDefault(vector, ptrVector.at(0)).get() == nullptr);
QVERIFY(Utils::takeOrDefault(vector, &foo).get() == nullptr);
QVERIFY(Utils::takeOrDefault(vector, nullptr).get() == nullptr);
} }
} }