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

Tests: Fix compile for older compiler / Qt

Browse Source 
Change-Id: I96e48c446ebd397c75dc0b47f9aaef1717b5e5af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2018-03-13 06:55:52 +01:00
parent f99944b617
commit f1985df55d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -555,23 +555,23 @@ void tst_Algorithm::take()
{
QList<Struct> v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17};
Utils::optional<Struct> r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(r1);
QCOMPARE(r1.value(), 13);
QVERIFY(static_cast<bool>(r1));
QCOMPARE(r1.value().member, 13);
Utils::optional<Struct> r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(r2);
QCOMPARE(r2.value(), 13);
QVERIFY(static_cast<bool>(r2));
QCOMPARE(r2.value().member, 13);
Utils::optional<Struct> r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(!r3);
QVERIFY(!static_cast<bool>(r3));
Utils::optional<Struct> r4 = Utils::take(v, &Struct::isEven);
QVERIFY(r4);
QCOMPARE(r4.value(), 6);
QVERIFY(static_cast<bool>(r4));
QCOMPARE(r4.value().member, 6);
}
{
QList<Struct> v {0, 0, 0, 0, 0, 0, 1, 2, 3};
Utils::optional<Struct> r1 = Utils::take(v, &Struct::member);
QVERIFY(r1);
QCOMPARE(r1.value(), 1);
QVERIFY(static_cast<bool>(r1));
QCOMPARE(r1.value().member, 1);
}
}

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

@@ -285,23 +285,23 @@ void tst_PointerAlgorithm::take()
{
QList<Struct> v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17};
Utils::optional<Struct> r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(r1);
QCOMPARE(r1.value(), 13);
QVERIFY(static_cast<bool>(r1));
QCOMPARE(r1.value().member, 13);
Utils::optional<Struct> r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(r2);
QCOMPARE(r2.value(), 13);
QVERIFY(static_cast<bool>(r2));
QCOMPARE(r2.value().member, 13);
Utils::optional<Struct> r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
QVERIFY(!r3);
QVERIFY(!static_cast<bool>(r3));
Utils::optional<Struct> r4 = Utils::take(v, &Struct::isEven);
QVERIFY(r4);
QCOMPARE(r4.value(), 6);
QVERIFY(static_cast<bool>(r4));
QCOMPARE(r4.value().member, 6);
}
{
QList<Struct> v {0, 0, 0, 0, 0, 0, 1, 2, 3};
Utils::optional<Struct> r1 = Utils::take(v, &Struct::member);
QVERIFY(r1);
QCOMPARE(r1.value(), 1);
QVERIFY(static_cast<bool>(r1));
QCOMPARE(r1.value().member, 1);
}
}