From 566b118a873652bf9a5f7d72efcc379698ca9675 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 27 Nov 2017 11:31:15 +0100 Subject: Utils: Make algorithms take more containers Change-Id: I05bd1052bbc2c6481fdec8a3763d9ae4f3dc8f44 Reviewed-by: hjk Reviewed-by: Eike Ziller --- tests/auto/algorithm/tst_algorithm.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/auto/algorithm/tst_algorithm.cpp') diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp index 47e05b4636..9a227eb1b5 100644 --- a/tests/auto/algorithm/tst_algorithm.cpp +++ b/tests/auto/algorithm/tst_algorithm.cpp @@ -25,6 +25,8 @@ #include +#include + #include class tst_Algorithm : public QObject @@ -151,6 +153,18 @@ void tst_Algorithm::sort() QList s6({&arr2[0], &arr2[1], &arr2[2]}); Utils::sort(s6, &Struct::member); QCOMPARE(s6, QList({&arr2[1], &arr2[2], &arr2[0]})); + // std::array: + std::array array = {{4, 10, 8, 1}}; + Utils::sort(array); + std::array arrayResult = {{1, 4, 8, 10}}; + QCOMPARE(array, arrayResult); + // valarray (no begin/end member functions): + std::valarray valarray(array.data(), array.size()); + std::valarray valarrayResult(arrayResult.data(), arrayResult.size()); + Utils::sort(valarray); + QCOMPARE(valarray.size(), valarrayResult.size()); + for (size_t i = 0; i < valarray.size(); ++i) + QCOMPARE(valarray[i], valarrayResult[i]); } QTEST_MAIN(tst_Algorithm) -- cgit v1.2.1