added iterator tests

Author: Skycoder42

src/datasync/asyncdatastore.cpp

@@ -71,9 +71,9 @@ Task AsyncDataStore::search(int dataMetaTypeId, int listMetaTypeId, const QStrin
 
 void AsyncDataStore::iterate(int metaTypeId, const std::function<bool(QVariant)> &iterator, const std::function<void(const QException &)> &onExcept)
 {
-	keys(metaTypeId).onResult([=](QStringList keys) {
+	keys(metaTypeId).onResult(this, [=](QStringList keys) {
 		if(!keys.isEmpty()) {
-			load(metaTypeId, keys[0]).onResult([=](QVariant result) {
+			load(metaTypeId, keys[0]).onResult(this, [=](QVariant result) {
 				internalIterate(metaTypeId, keys, 0, result, iterator, onExcept);
 			}, onExcept);
 		}
@@ -176,7 +176,7 @@ void AsyncDataStore::internalIterate(int metaTypeId, const QStringList &keys, in
 {
 	if(iterator(res)) {
 		if(++index < keys.size()) {
-			load(metaTypeId, keys[index]).onResult([=](QVariant result) {
+			load(metaTypeId, keys[index]).onResult(this, [=](QVariant result) {
 				internalIterate(metaTypeId, keys, index, result, iterator, onExcept);
 			}, onExcept);
 		}

tests/auto/datasync/LocalStoreTest/tst_localstore.cpp

@@ -8,6 +8,9 @@ class LocalStoreTest : public QObject
 {
 	Q_OBJECT
 
+Q_SIGNALS:
+	void unlock();
+
 private Q_SLOTS:
 	void initTestCase();
 	void cleanupTestCase();
@@ -26,6 +29,8 @@ private Q_SLOTS:
 	void testRemove();
 	void testSearch_data();
 	void testSearch();
+	void testIterate_data();
+	void testIterate();
 
 	void testLoadInto_data();
 	void testLoadInto();
@@ -350,6 +355,69 @@ void LocalStoreTest::testSearch()
 	}
 }
 
+void LocalStoreTest::testIterate_data()
+{
+	QTest::addColumn<DataSet>("data");
+	QTest::addColumn<QList<TestData>>("result");
+	QTest::addColumn<bool>("shouldFail");
+
+	QTest::newRow("emptyData") << DataSet()
+							   << QList<TestData>()
+							   << false;
+	QTest::newRow("simpleData") << generateDataJson(5, 55)
+								<< generateData(5, 55)
+								<< false;
+	QTest::newRow("invalidData") << generateDataJson(10, 20)
+								 << QList<TestData>()
+								 << true;
+}
+
+void LocalStoreTest::testIterate()
+{
+	QFETCH(DataSet, data);
+	QFETCH(QList<TestData>, result);
+	QFETCH(bool, shouldFail);
+
+	store->mutex.lock();
+	store->pseudoStore = data;
+	store->failCount = shouldFail ? 1 : 0;
+	store->mutex.unlock();
+
+	QSignalSpy spy(this, &LocalStoreTest::unlock);
+
+	async->iterate<TestData>([=, &result](TestData data){
+		auto ok = false;
+
+		[&](){
+			QVERIFY(!shouldFail);
+			QVERIFY(!result.isEmpty());
+			for(auto i = 0; i < result.size(); i++) {
+				if(data.id == result[i].id) {
+					QCOMPARE(data, result[i]);
+					result.takeAt(i);
+					ok = true;
+					break;
+				}
+			}
+		}();
+
+		if(!ok || result.isEmpty())
+			emit unlock();
+
+		return ok;
+	}, [=](const QException &e){
+		QVERIFY2(shouldFail, e.what());
+		emit unlock();
+	});
+
+	if(data.isEmpty())
+		QVERIFY(!spy.wait());
+	else {
+		QVERIFY(spy.wait());
+		QVERIFY(result.isEmpty());
+	}
+}
+
 void LocalStoreTest::testLoadInto_data()
 {
 	QTest::addColumn<DataSet>("data");