improved test automation

Author: Skycoder42

tests/TestInstaller/QtAutoUpdaterTestInstaller.zip

@@ -15,5 +15,10 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-SOURCES += tst_updatertest.cpp
+SOURCES += tst_updatertest.cpp \
+	installercontroller.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
+DEFINES += BINDIR=\\\"$$[QT_INSTALL_BINS]/../../../Tools/QtInstallerFramework/2.0/bin/\\\"
+
+HEADERS += \
+	installercontroller.h

tests/TestInstaller/TestInstaller.pro

@@ -0,0 +1,88 @@
+#include "installercontroller.h"
+
+#include <QProcess>
+#include <QtTest>
+
+static const QString configFile = SRCDIR + QStringLiteral("../../../installer/config/config.xml");
+static const QString configScript = SRCDIR + QStringLiteral("../../../installer/config/controller.qs");
+static const QString pkgFile = SRCDIR + QStringLiteral("../../../installer/packages/de.skycoder42.QtAutoUpdaterTestInstaller/meta/package.xml");
+static const QString binarycreator = BINDIR + QStringLiteral("binarycreator");
+static const QString repogen = BINDIR + QStringLiteral("repogen");
+
+InstallerController::InstallerController(QObject *parent) :
+	QObject(parent),
+	_version(1, 0, 0),
+	_buildDir()
+{
+	setVersion(_version);
+}
+
+void InstallerController::createRepository()
+{
+	auto res = QProcess::execute(repogen, {"--update-new-components", "-p", _buildDir.path() + "/packages", _buildDir.path() + "/repository"});
+	QCOMPARE(res, 0);
+}
+
+void InstallerController::createInstaller()
+{
+	QFile configSrc(configFile);
+	QFile configOut(_buildDir.path() + "/config.xml");
+
+	QVERIFY(configSrc.open(QIODevice::ReadOnly | QIODevice::Text));
+	QVERIFY(configOut.open(QIODevice::WriteOnly | QIODevice::Text));
+	auto src = QString::fromUtf8(configSrc.readAll());
+	configOut.write(src
+					.arg(_buildDir.path() + "/install")
+					.arg(_buildDir.path())
+					.toUtf8());
+	configSrc.close();
+	configOut.close();
+
+	auto res = QProcess::execute(binarycreator, {"-n", "-c", configOut.fileName(), "-p", _buildDir.path() + "/packages", _buildDir.path() + "/QtAutoUpdaterTestInstaller"});
+	QCOMPARE(res, 0);
+}
+
+void InstallerController::installLocal()
+{
+	auto res = QProcess::execute(_buildDir.path() + "/QtAutoUpdaterTestInstaller", {"-platform", "minimal", "--script", configScript});
+	QCOMPARE(res, 0);
+}
+
+void InstallerController::runUpdater()
+{
+
+}
+
+QVersionNumber InstallerController::version() const
+{
+	return _version;
+}
+
+QString InstallerController::maintenanceToolPath() const
+{
+	return _buildDir.path() + "/install";
+}
+
+void InstallerController::setVersion(QVersionNumber version)
+{
+	_version = version;
+
+	QDir tDir(_buildDir.path());
+	QVERIFY(tDir.mkpath("packages/de.skycoder42.QtAutoUpdaterTestInstaller/meta"));
+	QVERIFY(tDir.mkpath("packages/de.skycoder42.QtAutoUpdaterTestInstaller/data"));
+
+	QFile pkgSrc(pkgFile);
+	QFile pkgOut(_buildDir.path() + "/packages/de.skycoder42.QtAutoUpdaterTestInstaller/meta/package.xml");
+
+	QVERIFY(pkgSrc.open(QIODevice::ReadOnly | QIODevice::Text));
+	QVERIFY(pkgOut.open(QIODevice::WriteOnly | QIODevice::Text));
+	auto src = QString::fromUtf8(pkgSrc.readAll());
+	pkgOut.write(src.arg(_version.toString()).toUtf8());
+	pkgSrc.close();
+	pkgOut.close();
+
+	QFile dataFile(_buildDir.path() + "/packages/de.skycoder42.QtAutoUpdaterTestInstaller/data/version.txt");
+	QVERIFY(dataFile.open(QIODevice::WriteOnly | QIODevice::Text));
+	dataFile.write(_version.toString().toUtf8());
+	dataFile.close();
+}

tests/TestInstaller/build_mac.command

@@ -0,0 +1,33 @@
+#ifndef INSTALLERCONTROLLER_H
+#define INSTALLERCONTROLLER_H
+
+#include <QObject>
+#include <QVersionNumber>
+#include <QTemporaryDir>
+
+class InstallerController : public QObject
+{
+	Q_OBJECT
+
+	Q_PROPERTY(QVersionNumber version READ version WRITE setVersion)
+
+public:
+	explicit InstallerController(QObject *parent = nullptr);
+
+	void createRepository();
+	void createInstaller();
+	void installLocal();
+	void runUpdater();
+
+	QVersionNumber version() const;
+	QString maintenanceToolPath() const;
+
+public slots:
+	void setVersion(QVersionNumber version);
+
+private:
+	QVersionNumber _version;
+	QTemporaryDir _buildDir;
+};
+
+#endif // INSTALLERCONTROLLER_H

tests/TestInstaller/build_win.bat

@@ -3,6 +3,7 @@
 #include <QSignalSpy>
 #include <QVector>
 #include <functional>
+#include "installercontroller.h"
 using namespace QtAutoUpdater;
 
 #define TEST_DELAY 1000
@@ -22,18 +23,31 @@ class UpdaterTest : public QObject
 	Q_OBJECT
 
 private Q_SLOTS:
+	void initTestCase();
 	void testUpdaterInitState();
 
 	void testUpdateCheck_data();
 	void testUpdateCheck();
 
 private:
 	Updater *updater;
+
+	InstallerController *controller;
 	QSignalSpy *checkSpy;
 	QSignalSpy *runningSpy;
 	QSignalSpy *updateInfoSpy;
 };
 
+void UpdaterTest::initTestCase()
+{
+	controller = new InstallerController(this);
+	controller->createRepository();
+	controller->createInstaller();
+	controller->installLocal();
+	controller->setVersion({1, 1, 0});
+	controller->createRepository();
+}
+
 void UpdaterTest::testUpdaterInitState()
 {
 	updater = new Updater(this);
@@ -64,9 +78,8 @@ void UpdaterTest::testUpdateCheck_data()
 	QTest::addColumn<QList<Updater::UpdateInfo>>("updates");
 
 	QList<Updater::UpdateInfo> updates;
-	updates += {"QtAutoUpdaterTestInstaller", QVersionNumber::fromString("1.0.1"), 46ull};
-	QString homePath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
-	QString path = homePath + "/QtAutoUpdaterTestInstaller";
+	updates += {"QtAutoUpdaterTestInstaller", QVersionNumber::fromString("1.1.0"), 45ull};
+	QString path = controller->maintenanceToolPath();
 	QTest::newRow("QtAutoUpdaterTestInstaller") << path + "/maintenancetool"
 												<< true
 												<< updates;
@@ -76,7 +89,7 @@ void UpdaterTest::testUpdateCheck_data()
 #ifdef Q_OS_WIN
 	path = "C:/Qt";
 #else
-	path = homePath + "/Qt";
+	path = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Qt";
 #endif
 	QTest::newRow("Qt") << path + "/MaintenanceTool"
 						<< false