added iterator tests

Author: Skycoder42

tests/auto/datasync/TestDataStore/tst_datastore.cpp

@@ -20,6 +20,7 @@ private Q_SLOTS:
 	void testAll();
 	void testContains();
 	void testFind();
+	void testIterate();
 	void testRemove_data();
 	void testRemove();
 	void testClear();
@@ -142,6 +143,53 @@ void TestDataStore::testFind()
 	}
 }
 
+void TestDataStore::testIterate()
+{
+	try {
+		//normal iterate
+		{
+			QList<TestData> objects = TestLib::generateData(429, 432);
+			store->iterate<TestData>([&](const TestData &data){
+				auto ok = false;
+				[&](){
+					QVERIFY(!objects.isEmpty());
+					QCOMPARE(data, objects.takeFirst());
+					ok = true;
+				}();
+				return ok;
+			});
+			QVERIFY(objects.isEmpty());
+		}
+
+		//iterate with delete
+		{
+			QList<TestData> objects = TestLib::generateData(429, 432);
+			objects.removeAt(2);
+			bool first = true;
+			store->iterate<TestData>([&](const TestData &data){
+				auto ok = false;
+				[&](){
+					if(first) {
+						QVERIFY(data.id != 431);
+						first = false;
+						store->remove<TestData>(431);
+					}
+					QVERIFY(!objects.isEmpty());
+					QCOMPARE(data, objects.takeFirst());
+					ok = true;
+				}();
+				return ok;
+			});
+			QVERIFY(objects.isEmpty());
+
+			//re-add for further tests
+			store->save(TestLib::generateData(431));
+		}
+	} catch(QException &e) {
+		QFAIL(e.what());
+	}
+}
+
 void TestDataStore::testRemove_data()
 {
 	QTest::addColumn<int>("key");

tests/auto/datasync/TestDataTypeStore/tst_datatypestore.cpp

@@ -76,6 +76,12 @@ void TestDataTypeStore::testSimple()
 		QList<int> k = {0, 1, 2, 3};
 		QCOMPAREUNORDERED(store.keys(), k);
 		QCOMPAREUNORDERED(store.loadAll(), TestLib::generateData(0, 3));
+		auto iterCount = 0;
+		store.iterate([&](const TestData &data){
+			iterCount++;
+			return true;
+		});
+		QCOMPARE(iterCount, 4);
 
 		QVERIFY(store.remove(1));
 		QCOMPARE(store.count(), 3);
@@ -186,7 +192,7 @@ void TestDataTypeStore::testCaching(std::function<QList<T>(int,int)> generator,
 	}
 }
 
-static void dataTypeStoreCompiletest_DO_NOT_CALL()
+Q_DECL_UNUSED static void dataTypeStoreCompiletest_DO_NOT_CALL()
 {
 	DataTypeStore<TestData, int> t1;
 	t1.count();
@@ -196,7 +202,7 @@ static void dataTypeStoreCompiletest_DO_NOT_CALL()
 	t1.save(TestData());
 	t1.remove(5);
 	t1.search(QStringLiteral("47"));
-	t1.iterate([](TestData) {
+	t1.iterate([](const TestData &) {
 		return false;
 	});
 	t1.clear();