diff --git a/tests/testlib/akonadifakedataxmlloader.cpp b/tests/testlib/akonadifakedataxmlloader.cpp --- a/tests/testlib/akonadifakedataxmlloader.cpp +++ b/tests/testlib/akonadifakedataxmlloader.cpp @@ -90,9 +90,9 @@ i.setId(itemId++); i.setParentCollection(c); i.setModificationTime(QDateTime::currentDateTime()); - auto tags = Akonadi::Tag::List(); - std::transform(i.tags().constBegin(), i.tags().constEnd(), - std::back_inserter(tags), + auto tags = i.tags(); + std::transform(tags.constBegin(), tags.constEnd(), + tags.begin(), [&tagByRid] (const Akonadi::Tag &tag) { return tagByRid.value(tag.remoteId()); }); diff --git a/tests/units/akonadi/akonadidatasourcequeriestest.cpp b/tests/units/akonadi/akonadidatasourcequeriestest.cpp --- a/tests/units/akonadi/akonadidatasourcequeriestest.cpp +++ b/tests/units/akonadi/akonadidatasourcequeriestest.cpp @@ -205,8 +205,9 @@ QVERIFY(result->data().isEmpty()); TestHelpers::waitForEmptyJobQueue(); + const auto sources = result->data(); auto actualNames = QStringList(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort(); @@ -437,8 +438,9 @@ QVERIFY(result->data().isEmpty()); TestHelpers::waitForEmptyJobQueue(); + const auto sources = result->data(); auto actualNames = QStringList(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort(); @@ -703,8 +705,9 @@ QVERIFY(result->data().isEmpty()); TestHelpers::waitForEmptyJobQueue(); + auto sources = result->data(); auto actualNames = QStringList(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort(); @@ -720,8 +723,9 @@ // THEN TestHelpers::waitForEmptyJobQueue(); + sources = result->data(); actualNames.clear(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort(); @@ -973,8 +977,9 @@ QVERIFY(result->data().isEmpty()); TestHelpers::waitForEmptyJobQueue(); + auto sources = result->data(); auto actualNames = QStringList(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort(); @@ -990,8 +995,9 @@ // THEN TestHelpers::waitForEmptyJobQueue(); + sources = result->data(); actualNames.clear(); - std::transform(result->data().constBegin(), result->data().constEnd(), + std::transform(sources.constBegin(), sources.constEnd(), std::back_inserter(actualNames), [] (const Domain::DataSource::Ptr &source) { return source->name(); }); actualNames.sort();