Fixed tests to give more feedback and to work on Release builds.

Author: blizzard4591

test-shared/CMakeLists.txt

@@ -4,4 +4,4 @@ set(CMAKE_CXX_FLAGS "-std=c++14")
 add_executable(qsqlcipher-test main.cpp)
 target_link_libraries(qsqlcipher-test Qt5::Sql)
 
-add_test(NAME qsqlcipher-test COMMAND qsqlcipher-test)
+#add_test(NAME qsqlcipher-test COMMAND qsqlcipher-test)

test-shared/main.cpp

@@ -1,33 +1,31 @@
 #include <QCoreApplication>
-#include <QDebug>
 #include <QtSql>
 #include <QTemporaryDir>
 #include <iostream>
+#include <cstdlib>
 
-#ifndef QT_DEBUG
-#error Must be built in debug mode!
-#endif
+#define QSQLCIPHER_TEST_ASSERT(cond, message) if(!(cond)) { std::cerr << message << std::endl; exit(-1); }
 
 int main(int argc, char *argv[])
 {
 	QCoreApplication app(argc, argv);
 
 	for (const auto& driver : QSqlDatabase::drivers()) {
-		qDebug() << "Available QSqlDatabase driver: " << driver;
+		std::cout << "Available QSqlDatabase driver: " << driver.toStdString() << std::endl;
 	}
 
-	Q_ASSERT(QSqlDatabase::isDriverAvailable("QSQLITE")); // from Qt
-	Q_ASSERT(QSqlDatabase::isDriverAvailable("QSQLCIPHER")); // from our plugin
+	QSQLCIPHER_TEST_ASSERT(QSqlDatabase::isDriverAvailable("QSQLITE"), "QSQLITE driver is not available!"); // from Qt
+	QSQLCIPHER_TEST_ASSERT(QSqlDatabase::isDriverAvailable("QSQLCIPHER"), "QSQLCIPHER driver is not available!"); // from our plugin
 
 	QTemporaryDir tmp;
-	Q_ASSERT(tmp.isValid());
+	QSQLCIPHER_TEST_ASSERT(tmp.isValid(), "Could not get temp directory.");
 
 	auto withDB = [&](const char *driver, auto fn) {
 		QString path = QDir(tmp.path()).absoluteFilePath(QString(driver) + ".db");
 		{
 			QSqlDatabase db = QSqlDatabase::addDatabase(driver, "db");
 			db.setDatabaseName(path);
-			Q_ASSERT(db.open());
+			QSQLCIPHER_TEST_ASSERT(db.open(), "Could not open database!");
 			fn(db);
 		}
 		QSqlDatabase::removeDatabase("db");
@@ -46,27 +44,30 @@ int main(int argc, char *argv[])
 		// Check that we can read from the SQLite db
 		withDB("QSQLITE", [](auto db){
 			QSqlQuery q = db.exec("select bar from foo");
-			Q_ASSERT(q.next());
-			Q_ASSERT(q.value(0).toInt() == 42);
+			QSQLCIPHER_TEST_ASSERT(q.next(), "Expected a fetchable entry in Query object.");
+			QSQLCIPHER_TEST_ASSERT(q.value(0).toInt() == 42, "Database returned invalid value for row!");
 		});
 
 		std::cout << "Running Task 3..." << std::endl;
 		// Check that SQLite is not SQLCipher
 		withDB("QSQLITE", [](auto db){
 			QSqlQuery q = db.exec("select sqlcipher_export()");
 			QString errmsg = q.lastError().databaseText();
-			Q_ASSERT(errmsg.startsWith("no such function"));
+			QSQLCIPHER_TEST_ASSERT(errmsg.startsWith("no such function"), "Database did not respond with the expected error message.");
 		});
 	}
 
 	// QSQLCIPHER
 	{
+#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER )
+		std::cout << "Hint: If you get an error in the following task like \"QSQLCIPHER driver not loaded\" then check if library dependencies (e.g. libeay32.dll) are in the same folder as the test executable." << std::endl;
+#endif
 		std::cout << "Running Task 4..." << std::endl;
 		// Check that SQLCipher is not SQLite
 		withDB("QSQLCIPHER", [](auto db){
 			QSqlQuery q = db.exec("select sqlcipher_export()");
 			QString errmsg = q.lastError().databaseText();
-			Q_ASSERT(errmsg.startsWith("wrong number of arguments"));
+			QSQLCIPHER_TEST_ASSERT(errmsg.startsWith("wrong number of arguments"), "Database did not respond with the expected error message.");
 		});
 
 		std::cout << "Running Task 5..." << std::endl;
@@ -84,16 +85,16 @@ int main(int argc, char *argv[])
 		// Check that we can't read from the SQLCipher db without the passphrase
 		withDB("QSQLCIPHER", [](auto db){
 			QSqlQuery q = db.exec("select bar from foo");
-			Q_ASSERT(!q.next());
+			QSQLCIPHER_TEST_ASSERT(!q.next(), "Query returned a fetchable row, this should not be the case.");
 		});
 
 		std::cout << "Running Task 7..." << std::endl;
 		// Check that we can read from the SQLCipher db with the passphrase
 		withDB("QSQLCIPHER", [](auto db){
 			db.exec("PRAGMA key = 'foobar';");
 			QSqlQuery q = db.exec("select bar from foo");
-			Q_ASSERT(q.next());
-			Q_ASSERT(q.value(0).toInt() == 42);
+			QSQLCIPHER_TEST_ASSERT(q.next(), "Expected a fetchable entry in Query object.");
+			QSQLCIPHER_TEST_ASSERT(q.value(0).toInt() == 42, "Database returned invalid value for row!");
 		});
 		std::cout << "Success! All tests completed." << std::endl;
 	}