Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop

22 files changed, 685 insertions, 86 deletions

diff --git a/MultiMC.h b/MultiMC.h
index 7bfa0023..4a33fb69 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -124,6 +124,9 @@ private:
 	void initTranslations();
 
 private:
+	friend class UpdateCheckerTest;
+	friend class DownloadUpdateTaskTest;
+
 	std::shared_ptr<QTranslator> m_qt_translator;
 	std::shared_ptr<QTranslator> m_mmc_translator;
 	std::shared_ptr<SettingsObject> m_settings;
diff --git a/logic/updater/DownloadUpdateTask.cpp b/logic/updater/DownloadUpdateTask.cpp
index d9aab826..d72cfcf6 100644
--- a/logic/updater/DownloadUpdateTask.cpp
+++ b/logic/updater/DownloadUpdateTask.cpp
@@ -45,55 +45,54 @@ void DownloadUpdateTask::executeTask()
 	findCurrentVersionInfo();
 }
 
-void DownloadUpdateTask::findCurrentVersionInfo()
+void DownloadUpdateTask::processChannels()
 {
-	setStatus(tr("Finding information about the current version."));
-
 	auto checker = MMC->updateChecker();
 
-	// This runs after we've tried loading the channel list.
-	// If the channel list doesn't need to be loaded, this will be called immediately.
-	// If the channel list does need to be loaded, this will be called when it's done.
-	auto processFunc = [this, &checker] () -> void
+	// Now, check the channel list again.
+	if (!checker->hasChannels())
 	{
-		// Now, check the channel list again.
-		if (checker->hasChannels())
-		{ 
-			// We still couldn't load the channel list. Give up. Call loadVersionInfo and return.
-			QLOG_INFO() << "Reloading the channel list didn't work. Giving up.";
-			loadVersionInfo();
-			return;
-		}
+		// We still couldn't load the channel list. Give up. Call loadVersionInfo and return.
+		QLOG_INFO() << "Reloading the channel list didn't work. Giving up.";
+		loadVersionInfo();
+		return;
+	}
 
-		QList<UpdateChecker::ChannelListEntry> channels = checker->getChannelList();
-		QString channelId = MMC->version().channel;
+	QList<UpdateChecker::ChannelListEntry> channels = checker->getChannelList();
+	QString channelId = MMC->version().channel;
 
-		// Search through the channel list for a channel with the correct ID.
-		for (auto channel : channels)
+	// Search through the channel list for a channel with the correct ID.
+	for (auto channel : channels)
+	{
+		if (channel.id == channelId)
 		{
-			if (channel.id == channelId)
-			{
-				QLOG_INFO() << "Found matching channel.";
-				m_cRepoUrl = channel.url;
-				break;
-			}
+			QLOG_INFO() << "Found matching channel.";
+			m_cRepoUrl = preparePath(channel.url);
+			break;
 		}
+	}
 
-		// Now that we've done that, load version info.
-		loadVersionInfo();
-	};
+	// Now that we've done that, load version info.
+	loadVersionInfo();
+}
+
+void DownloadUpdateTask::findCurrentVersionInfo()
+{
+	setStatus(tr("Finding information about the current version."));
 
-	if (checker->hasChannels())
+	auto checker = MMC->updateChecker();
+
+	if (!checker->hasChannels())
 	{
 		// Load the channel list and wait for it to finish loading.
 		QLOG_INFO() << "No channel list entries found. Will try reloading it.";
 
-		QObject::connect(checker.get(), &UpdateChecker::channelListLoaded, processFunc);
+		QObject::connect(checker.get(), &UpdateChecker::channelListLoaded, this, &DownloadUpdateTask::processChannels);
 		checker->updateChanList();
 	}
 	else
 	{
-		processFunc();
+		processChannels();
 	}
 }
 
@@ -152,12 +151,24 @@ void DownloadUpdateTask::parseDownloadedVersionInfo()
 {
 	setStatus(tr("Reading file lists."));
 
-	parseVersionInfo(NEW_VERSION, &m_nVersionFileList);
+	setStatus(tr("Reading file list for new version."));
+	QLOG_DEBUG() << "Reading file list for new version.";
+	QString error;
+	if (!parseVersionInfo(std::dynamic_pointer_cast<ByteArrayDownload>(
+							  m_vinfoNetJob->first())->m_data, &m_nVersionFileList, &error))
+	{
+		emitFailed(error);
+		return;
+	}
 
 	// If there is a second entry in the network job's list, load it as the current version's info.
 	if (m_vinfoNetJob->size() >= 2 && m_vinfoNetJob->operator[](1)->m_status != Job_Failed)
 	{
-		parseVersionInfo(CURRENT_VERSION, &m_cVersionFileList);
+		setStatus(tr("Reading file list for current version."));
+		QLOG_DEBUG() << "Reading file list for current version.";
+		QString error;
+		parseVersionInfo(std::dynamic_pointer_cast<ByteArrayDownload>(
+							 m_vinfoNetJob->operator[](1))->m_data, &m_cVersionFileList, &error);
 	}
 
 	// We don't need this any more.
@@ -167,26 +178,15 @@ void DownloadUpdateTask::parseDownloadedVersionInfo()
 	processFileLists();
 }
 
-void DownloadUpdateTask::parseVersionInfo(VersionInfoFileEnum vfile, VersionFileList* list)
+bool DownloadUpdateTask::parseVersionInfo(const QByteArray &data, VersionFileList* list, QString *error)
 {
-	if (vfile == CURRENT_VERSION)  setStatus(tr("Reading file list for current version."));
-	else if (vfile == NEW_VERSION) setStatus(tr("Reading file list for new version."));
-
-	QLOG_DEBUG() << "Reading file list for" << (vfile == NEW_VERSION ? "new" : "current") << "version.";
-	
-	QByteArray data;
-	{
-		ByteArrayDownloadPtr dl = std::dynamic_pointer_cast<ByteArrayDownload>(
-				vfile == NEW_VERSION ? m_vinfoNetJob->first() : m_vinfoNetJob->operator[](1));
-		data = dl->m_data;
-	}
-
 	QJsonParseError jsonError;
 	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
 	if (jsonError.error != QJsonParseError::NoError)
 	{
-		QLOG_ERROR() << "Failed to parse version info JSON:" << jsonError.errorString() << "at" << jsonError.offset;
-		return;
+		*error = QString("Failed to parse version info JSON: %1 at %2").arg(jsonError.errorString()).arg(jsonError.offset);
+		QLOG_ERROR() << error;
+		return false;
 	}
 
 	QJsonObject json = jsonDoc.object();
@@ -213,11 +213,11 @@ void DownloadUpdateTask::parseVersionInfo(VersionInfoFileEnum vfile, VersionFile
 			QString type = sourceObj.value("SourceType").toString();
 			if (type == "http")
 			{
-				file.sources.append(FileSource("http", sourceObj.value("Url").toString()));
+				file.sources.append(FileSource("http", preparePath(sourceObj.value("Url").toString())));
 			}
 			else if (type == "httpc")
 			{
-				file.sources.append(FileSource("httpc", sourceObj.value("Url").toString(), sourceObj.value("CompressionType").toString()));
+				file.sources.append(FileSource("httpc", preparePath(sourceObj.value("Url").toString()), sourceObj.value("CompressionType").toString()));
 			}
 			else
 			{
@@ -229,18 +229,41 @@ void DownloadUpdateTask::parseVersionInfo(VersionInfoFileEnum vfile, VersionFile
 
 		list->append(file);
 	}
+
+	return true;
 }
 
 void DownloadUpdateTask::processFileLists()
 {
+	// Create a network job for downloading files.
+	NetJob* netJob = new NetJob("Update Files");
+
+	processFileLists(netJob, m_cVersionFileList, m_nVersionFileList, m_operationList);
+
+	// Add listeners to wait for the downloads to finish.
+	QObject::connect(netJob, &NetJob::succeeded, this, &DownloadUpdateTask::fileDownloadFinished);
+	QObject::connect(netJob, &NetJob::progress, this, &DownloadUpdateTask::fileDownloadProgressChanged);
+	QObject::connect(netJob, &NetJob::failed, this, &DownloadUpdateTask::fileDownloadFailed);
+
+	// Now start the download.
+	setStatus(tr("Downloading %1 update files.").arg(QString::number(netJob->size())));
+	QLOG_DEBUG() << "Begin downloading update files to" << m_updateFilesDir.path();
+	m_filesNetJob.reset(netJob);
+	netJob->start();
+
+	writeInstallScript(m_operationList, PathCombine(m_updateFilesDir.path(), "file_list.xml"));
+}
+
+void DownloadUpdateTask::processFileLists(NetJob *job, const VersionFileList &currentVersion, const VersionFileList &newVersion, DownloadUpdateTask::UpdateOperationList &ops)
+{
 	setStatus(tr("Processing file lists. Figuring out how to install the update."));
 
 	// First, if we've loaded the current version's file list, we need to iterate through it and 
 	// delete anything in the current one version's list that isn't in the new version's list.
-	for (VersionFileEntry entry : m_cVersionFileList)
+	for (VersionFileEntry entry : currentVersion)
 	{
 		bool keep = false;
-		for (VersionFileEntry newEntry : m_nVersionFileList)
+		for (VersionFileEntry newEntry : newVersion)
 		{
 			if (newEntry.path == entry.path)
 			{
@@ -251,14 +274,11 @@ void DownloadUpdateTask::processFileLists()
 		}
 		// If the loop reaches the end and we didn't find a match, delete the file.
 		if(!keep)
-			m_operationList.append(UpdateOperation::DeleteOp(entry.path));
+			ops.append(UpdateOperation::DeleteOp(entry.path));
 	}
 
-	// Create a network job for downloading files.
-	NetJob* netJob = new NetJob("Update Files");
-
 	// Next, check each file in MultiMC's folder and see if we need to update them.
-	for (VersionFileEntry entry : m_nVersionFileList)
+	for (VersionFileEntry entry : newVersion)
 	{
 		// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a way to do this in the background.
 		QString fileMD5;
@@ -285,34 +305,24 @@ void DownloadUpdateTask::processFileLists()
 					// Download it to updatedir/<filepath>-<md5> where filepath is the file's path with slashes replaced by underscores.
 					QString dlPath = PathCombine(m_updateFilesDir.path(), QString(entry.path).replace("/", "_"));
 
-					// We need to download the file to the updatefiles folder and add a task to copy it to its install path.
-					auto download = MD5EtagDownload::make(source.url, dlPath);
-					download->m_check_md5 = true;
-					download->m_expected_md5 = entry.md5;
-					netJob->addNetAction(download);
+					if (job)
+					{
+						// We need to download the file to the updatefiles folder and add a task to copy it to its install path.
+						auto download = MD5EtagDownload::make(source.url, dlPath);
+						download->m_check_md5 = true;
+						download->m_expected_md5 = entry.md5;
+						job->addNetAction(download);
+					}
 
 					// Now add a copy operation to our operations list to install the file.
-					m_operationList.append(UpdateOperation::CopyOp(dlPath, entry.path, entry.mode));
+					ops.append(UpdateOperation::CopyOp(dlPath, entry.path, entry.mode));
 				}
 			}
 		}
 	}
-
-	// Add listeners to wait for the downloads to finish.
-	QObject::connect(netJob, &NetJob::succeeded, this, &DownloadUpdateTask::fileDownloadFinished);
-	QObject::connect(netJob, &NetJob::progress, this, &DownloadUpdateTask::fileDownloadProgressChanged);
-	QObject::connect(netJob, &NetJob::failed, this, &DownloadUpdateTask::fileDownloadFailed);
-
-	// Now start the download.
-	setStatus(tr("Downloading %1 update files.").arg(QString::number(netJob->size())));
-	QLOG_DEBUG() << "Begin downloading update files to" << m_updateFilesDir.path();
-	m_filesNetJob.reset(netJob);
-	netJob->start();
-
-	writeInstallScript(m_operationList, PathCombine(m_updateFilesDir.path(), "file_list.xml"));
 }
 
-void DownloadUpdateTask::writeInstallScript(UpdateOperationList& opsList, QString scriptFile)
+bool DownloadUpdateTask::writeInstallScript(UpdateOperationList& opsList, QString scriptFile)
 {
 	// Build the base structure of the XML document.
 	QDomDocument doc;
@@ -377,7 +387,15 @@ void DownloadUpdateTask::writeInstallScript(UpdateOperationList& opsList, QStrin
 	else
 	{
 		emitFailed(tr("Failed to write update script file."));
+		return false;
 	}
+
+	return true;
+}
+
+QString DownloadUpdateTask::preparePath(const QString &path)
+{
+	return QString(path).replace("$PWD", qApp->applicationDirPath());
 }
 
 void DownloadUpdateTask::fileDownloadFinished()
diff --git a/logic/updater/DownloadUpdateTask.h b/logic/updater/DownloadUpdateTask.h
index f5b23d12..8530be77 100644
--- a/logic/updater/DownloadUpdateTask.h
+++ b/logic/updater/DownloadUpdateTask.h
@@ -34,7 +34,8 @@ public:
 	 */
 	QString updateFilesDir();
 	
-protected:
+public:
+
 	// TODO: We should probably put these data structures into a separate header...
 
 	/*!
@@ -53,7 +54,6 @@ protected:
 		QString url;
 		QString compressionType;
 	};
-
 	typedef QList<FileSource> FileSourceList;
 
 	/*!
@@ -66,10 +66,8 @@ protected:
 		FileSourceList sources;
 		QString md5;
 	};
-
 	typedef QList<VersionFileEntry> VersionFileList;
 
-
 	/*!
 	 * Structure that describes an operation to perform when installing updates.
 	 */
@@ -100,9 +98,12 @@ protected:
 
 		// Yeah yeah, polymorphism blah blah inheritance, blah blah object oriented. I'm lazy, OK?
 	};
-
 	typedef QList<UpdateOperation> UpdateOperationList;
 
+protected:
+	friend class DownloadUpdateTaskTest;
+
+
 	/*!
 	 * Used for arguments to parseVersionInfo and friends to specify which version info file to parse.
 	 */
@@ -120,6 +121,13 @@ protected:
 	virtual void findCurrentVersionInfo();
 
 	/*!
+	 * This runs after we've tried loading the channel list.
+	 * If the channel list doesn't need to be loaded, this will be called immediately.
+	 * If the channel list does need to be loaded, this will be called when it's done.
+	 */
+	void processChannels();
+
+	/*!
 	 * Downloads the version info files from the repository.
 	 * The files for both the current build, and the build that we're updating to need to be downloaded.
 	 * If the current version's info file can't be found, MultiMC will not delete files that 
@@ -142,20 +150,25 @@ protected:
 	/*!
 	 * Loads the file list from the given version info JSON object into the given list.
 	 */
-	virtual void parseVersionInfo(VersionInfoFileEnum vfile, VersionFileList* list);
+	virtual bool parseVersionInfo(const QByteArray &data, VersionFileList* list, QString *error);
 
 	/*!
 	 * Takes a list of file entries for the current version's files and the new version's files
 	 * and populates the downloadList and operationList with information about how to download and install the update.
 	 */
+	virtual void processFileLists(NetJob *job, const VersionFileList &currentVersion, const VersionFileList &newVersion, UpdateOperationList &ops);
+
+	/*!
+	 * Calls \see processFileLists to populate the \see m_operationList and a NetJob, and then executes
+	 * the NetJob to fetch all needed files
+	 */
 	virtual void processFileLists();
 
 	/*!
 	 * Takes the operations list and writes an install script for the updater to the update files directory.
 	 */
-	virtual void writeInstallScript(UpdateOperationList& opsList, QString scriptFile);
+	virtual bool writeInstallScript(UpdateOperationList& opsList, QString scriptFile);
 
-	VersionFileList m_downloadList;
 	UpdateOperationList m_operationList;
 
 	VersionFileList m_nVersionFileList;
@@ -181,6 +194,11 @@ protected:
 	 */
 	QTemporaryDir m_updateFilesDir;
 
+	/*!
+	 * Substitutes $PWD for the application directory
+	 */
+	static QString preparePath(const QString &path);
+
 protected slots:
 	void vinfoDownloadFinished();
 	void vinfoDownloadFailed();
diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp
index 5ff1898e..af56288c 100644
--- a/logic/updater/UpdateChecker.cpp
+++ b/logic/updater/UpdateChecker.cpp
@@ -44,7 +44,7 @@ QList<UpdateChecker::ChannelListEntry> UpdateChecker::getChannelList() const
 
 bool UpdateChecker::hasChannels() const
 {
-	return m_channels.isEmpty();
+	return !m_channels.isEmpty();
 }
 
 void UpdateChecker::checkForUpdate()
diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h
index 59fb8e47..5b7efc05 100644
--- a/logic/updater/UpdateChecker.h
+++ b/logic/updater/UpdateChecker.h
@@ -27,6 +27,9 @@ public:
 	UpdateChecker();
 	void checkForUpdate();
 
+	void setCurrentChannel(const QString &channel) { m_currentChannel = channel; }
+	void setChannelListUrl(const QString &url) { m_channelListUrl = url; }
+
 	/*!
 	 * Causes the update checker to download the channel list from the URL specified in config.h (generated by CMake).
 	 * If this isn't called before checkForUpdate(), it will automatically be called.
@@ -70,6 +73,8 @@ private slots:
 	void chanListDownloadFailed();
 
 private:
+	friend class UpdateCheckerTest;
+
 	NetJobPtr indexJob;
 	NetJobPtr chanListJob;
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e115af17..14670fbd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,6 +20,8 @@ endmacro()
 
 add_unit_test(pathutils tst_pathutils.cpp)
 add_unit_test(userutils tst_userutils.cpp)
+add_unit_test(UpdateChecker tst_UpdateChecker.cpp)
+add_unit_test(DownloadUpdateTask tst_DownloadUpdateTask.cpp)
 
 # Tests END #
 	
diff --git a/tests/TestUtil.h b/tests/TestUtil.h
index 64ee1675..865fcf87 100644
--- a/tests/TestUtil.h
+++ b/tests/TestUtil.h
@@ -15,9 +15,14 @@ struct TestsInternal
                 f.open(QFile::ReadOnly);
                 return f.readAll();
         }
+		static QString readFileUtf8(const QString &fileName)
+		{
+			return QString::fromUtf8(readFile(fileName));
+		}
 };
 
 #define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA( file ))
+#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA( file ))
 
 #define QTEST_GUILESS_MAIN_MULTIMC(TestObject) \
 int main(int argc, char *argv[]) \
diff --git a/tests/data/1.json b/tests/data/1.json
new file mode 100644
index 00000000..d5261d2c
--- /dev/null
+++ b/tests/data/1.json
@@ -0,0 +1,43 @@
+{
+	"ApiVersion": 0,
+	"Id": 1,
+	"Name": "1.0.1",
+	"Files": [
+		{
+			"Path": "fileOne",
+			"Sources": [
+				{
+					"SourceType": "http",
+					"Url": "file://$PWD/tests/data/fileOneA"
+				}
+			],
+			"Executable": true,
+			"Perms": 493,
+			"MD5": "9eb84090956c484e32cb6c08455a667b"
+		},
+		{
+			"Path": "fileTwo",
+			"Sources": [
+				{
+					"SourceType": "http",
+					"Url": "file://$PWD/tests/data/fileTwo"
+				}
+			],
+			"Executable": false,
+			"Perms": 644,
+			"MD5": "38f94f54fa3eb72b0ea836538c10b043"
+		},
+		{
+			"Path": "fileThree",
+			"Sources": [
+				{
+					"SourceType": "http",
+					"Url": "file://$PWD/tests/data/fileThree"
+				}
+			],
+			"Executable": false,
+			"Perms": "750",
+			"MD5": "f12df554b21e320be6471d7154130e70"
+		}
+	]
+}
diff --git a/tests/data/2.json b/tests/data/2.json
new file mode 100644
index 00000000..a96aff79
--- /dev/null
+++ b/tests/data/2.json
@@ -0,0 +1,31 @@
+{
+	"ApiVersion": 0,
+	"Id": 1,
+	"Name": "1.0.1",
+	"Files": [
+		{
+			"Path": "fileOne",
+			"Sources": [
+				{
+					"SourceType": "http",
+					"Url": "file://$PWD/tests/data/fileOneB"
+				}
+			],
+			"Executable": true,
+			"Perms": 493,
+			"MD5": "42915a71277c9016668cce7b82c6b577"
+		},
+		{
+			"Path": "fileTwo",
+			"Sources": [
+				{
+					"SourceType": "http",
+					"Url": "file://$PWD/tests/data/fileTwo"
+				}
+			],
+			"Executable": false,
+			"Perms": 644,
+			"MD5": "38f94f54fa3eb72b0ea836538c10b043"
+		}
+	]
+}
diff --git a/tests/data/channels.json b/tests/data/channels.json
new file mode 100644
index 00000000..e4f04bff
--- /dev/null
+++ b/tests/data/channels.json
@@ -0,0 +1,23 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "file://$PWD/tests/data/"
+		},
+		{
+			"id": "stable",
+			"name": "Stable",
+			"description": "It's stable at least",
+			"url": "ftp://username@host/path/to/stuff"
+		},
+		{
+			"id": "42",
+			"name": "The Channel",
+			"description": "This is the channel that is going to answer all of your questions",
+			"url": "https://dent.me/tea"
+		}
+	]
+}
diff --git a/tests/data/errorChannels.json b/tests/data/errorChannels.json
new file mode 100644
index 00000000..333cd445
--- /dev/null
+++ b/tests/data/errorChannels.json
@@ -0,0 +1,23 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "http://example.org/stuff"
+		},
+		{
+			"id": "stable",
+			"name": "",
+			"description": "It's stable at least",
+			"url": "ftp://username@host/path/to/stuff"
+		},
+		{
+			"id": "42",
+			"name": "The Channel",
+			"description": "This is the channel that is going to answer all of your questions",
+			"url": ""
+		}
+	]
+}
diff --git a/tests/data/fileOneA b/tests/data/fileOneA
new file mode 100644
index 00000000..f2e41136
--- /dev/null
+++ b/tests/data/fileOneA
@@ -0,0 +1 @@
+stuff
diff --git a/tests/data/fileOneB b/tests/data/fileOneB
new file mode 100644
index 00000000..f9aba922
--- /dev/null
+++ b/tests/data/fileOneB
@@ -0,0 +1,3 @@
+stuff
+
+more stuff that came in the new version
diff --git a/tests/data/fileThree b/tests/data/fileThree
new file mode 100644
index 00000000..6353ff16
--- /dev/null
+++ b/tests/data/fileThree
@@ -0,0 +1 @@
+this is yet another file
diff --git a/tests/data/fileTwo b/tests/data/fileTwo
new file mode 100644
index 00000000..aad9a93a
--- /dev/null
+++ b/tests/data/fileTwo
@@ -0,0 +1 @@
+some other stuff
diff --git a/tests/data/garbageChannels.json b/tests/data/garbageChannels.json
new file mode 100644
index 00000000..1450fb9c
--- /dev/null
+++ b/tests/data/garbageChannels.json
@@ -0,0 +1,22 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+aa			"url": "http://example.org/stuff"
+		},
+a			"id": "stable",
+			"name": "Stable",
+			"description": "It's stable at least",
+			"url": "ftp://username@host/path/to/stuff"
+		},
+		{
+			"id": "42"f
+			"name": "The Channel",
+			"description": "This is the channel that is going to answer all of your questions",
+			"url": "https://dent.me/tea"
+		}
+	]
+}
diff --git a/tests/data/index.json b/tests/data/index.json
new file mode 100644
index 00000000..20ceb9f4
--- /dev/null
+++ b/tests/data/index.json
@@ -0,0 +1,9 @@
+{
+	"ApiVersion": 0,
+	"Versions": [
+		{ "Id": 0, "Name": "1.0.0" },
+		{ "Id": 1, "Name": "1.0.1" },
+		{ "Id": 2, "Name": "1.0.2" },
+		{ "Id": 3, "Name": "1.0.3" }
+	]
+}
diff --git a/tests/data/noChannels.json b/tests/data/noChannels.json
new file mode 100644
index 00000000..bbb2cb70
--- /dev/null
+++ b/tests/data/noChannels.json
@@ -0,0 +1,5 @@
+{
+	"format_version": 0,
+	"channels": [
+	]
+}
diff --git a/tests/data/oneChannel.json b/tests/data/oneChannel.json
new file mode 100644
index 00000000..84727ac7
--- /dev/null
+++ b/tests/data/oneChannel.json
@@ -0,0 +1,11 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "http://example.org/stuff"
+		}
+	]
+}
diff --git a/tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml b/tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml
new file mode 100644
index 00000000..09c162ca
--- /dev/null
+++ b/tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml
@@ -0,0 +1,17 @@
+<update version="3">
+ <install>
+  <file>
+   <source>sourceOne</source>
+   <dest>destOne</dest>
+   <mode>0777</mode>
+  </file>
+  <file>
+   <source>MultiMC.exe</source>
+   <dest>M/u/l/t/i/M/C/e/x/e</dest>
+   <mode>0644</mode>
+  </file>
+ </install>
+ <uninstall>
+  <file>toDelete.abc</file>
+ </uninstall>
+</update>
diff --git a/tests/tst_DownloadUpdateTask.cpp b/tests/tst_DownloadUpdateTask.cpp
new file mode 100644
index 00000000..d96e4cf1
--- /dev/null
+++ b/tests/tst_DownloadUpdateTask.cpp
@@ -0,0 +1,200 @@
+#include <QTest>
+#include <QSignalSpy>
+
+#include "TestUtil.h"
+
+#include "logic/updater/DownloadUpdateTask.h"
+#include "logic/updater/UpdateChecker.h"
+#include "depends/util/include/pathutils.h"
+
+Q_DECLARE_METATYPE(DownloadUpdateTask::VersionFileList)
+Q_DECLARE_METATYPE(DownloadUpdateTask::UpdateOperation)
+
+bool operator==(const DownloadUpdateTask::FileSource &f1, const DownloadUpdateTask::FileSource &f2)
+{
+	return f1.type == f2.type &&
+			f1.url == f2.url &&
+			f1.compressionType == f2.compressionType;
+}
+bool operator==(const DownloadUpdateTask::VersionFileEntry &v1, const DownloadUpdateTask::VersionFileEntry &v2)
+{
+	return v1.path == v2.path &&
+			v1.mode == v2.mode &&
+			v1.sources == v2.sources &&
+			v1.md5 == v2.md5;
+}
+bool operator==(const DownloadUpdateTask::UpdateOperation &u1, const DownloadUpdateTask::UpdateOperation &u2)
+{
+	return u1.type == u2.type &&
+			u1.file == u2.file &&
+			u1.dest == u2.dest &&
+			u1.mode == u2.mode;
+}
+
+QDebug operator<<(QDebug dbg, const DownloadUpdateTask::FileSource &f)
+{
+	dbg.nospace() << "FileSource(type=" << f.type << " url=" << f.url << " comp=" << f.compressionType << ")";
+	return dbg.maybeSpace();
+}
+QDebug operator<<(QDebug dbg, const DownloadUpdateTask::VersionFileEntry &v)
+{
+	dbg.nospace() << "VersionFileEntry(path=" << v.path << " mode=" << v.mode << " md5=" << v.md5 << " sources=" << v.sources << ")";
+	return dbg.maybeSpace();
+}
+QDebug operator<<(QDebug dbg, const DownloadUpdateTask::UpdateOperation::Type &t)
+{
+	switch (t)
+	{
+	case DownloadUpdateTask::UpdateOperation::OP_COPY: dbg << "OP_COPY"; break;
+	case DownloadUpdateTask::UpdateOperation::OP_DELETE: dbg << "OP_DELETE"; break;
+	case DownloadUpdateTask::UpdateOperation::OP_MOVE: dbg << "OP_MOVE"; break;
+	case DownloadUpdateTask::UpdateOperation::OP_CHMOD: dbg << "OP_CHMOD"; break;
+	}
+	return dbg.maybeSpace();
+}
+QDebug operator<<(QDebug dbg, const DownloadUpdateTask::UpdateOperation &u)
+{
+	dbg.nospace() << "UpdateOperation(type=" << u.type << " file=" << u.file << " dest=" << u.dest << " mode=" << u.mode << ")";
+	return dbg.maybeSpace();
+}
+
+class DownloadUpdateTaskTest : public QObject
+{
+	Q_OBJECT
+private
+slots:
+	void initTestCase()
+	{
+
+	}
+	void cleanupTestCase()
+	{
+
+	}
+
+	void test_writeInstallScript()
+	{
+		DownloadUpdateTask task(QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/")).toString(), 0);
+
+		DownloadUpdateTask::UpdateOperationList ops;
+
+		ops << DownloadUpdateTask::UpdateOperation::CopyOp("sourceOne", "destOne", 0777)
+			<< DownloadUpdateTask::UpdateOperation::CopyOp("MultiMC.exe", "M/u/l/t/i/M/C/e/x/e")
+			<< DownloadUpdateTask::UpdateOperation::DeleteOp("toDelete.abc");
+
+		const QString script = QDir::temp().absoluteFilePath("MultiMCUpdateScript.xml");
+		QVERIFY(task.writeInstallScript(ops, script));
+		QCOMPARE(TestsInternal::readFileUtf8(script), MULTIMC_GET_TEST_FILE_UTF8("tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml"));
+	}
+
+	void test_parseVersionInfo_data()
+	{
+		QTest::addColumn<QByteArray>("data");
+		QTest::addColumn<DownloadUpdateTask::VersionFileList>("list");
+		QTest::addColumn<QString>("error");
+		QTest::addColumn<bool>("ret");
+
+		QTest::newRow("one") << MULTIMC_GET_TEST_FILE("tests/data/1.json")
+							 << (DownloadUpdateTask::VersionFileList()
+								 << DownloadUpdateTask::VersionFileEntry{"fileOne", 493,
+																		 (DownloadUpdateTask::FileSourceList() << DownloadUpdateTask::FileSource("http", "file://" + qApp->applicationDirPath() + "/tests/data/fileOneA")),
+																		 "9eb84090956c484e32cb6c08455a667b"}
+								 << DownloadUpdateTask::VersionFileEntry{"fileTwo", 644,
+																		 (DownloadUpdateTask::FileSourceList() << DownloadUpdateTask::FileSource("http", "file://" + qApp->applicationDirPath() + "/tests/data/fileTwo")),
+																		 "38f94f54fa3eb72b0ea836538c10b043"}
+								 << DownloadUpdateTask::VersionFileEntry{"fileThree", 750,
+																		 (DownloadUpdateTask::FileSourceList() << DownloadUpdateTask::FileSource("http", "file://" + qApp->applicationDirPath() + "/tests/data/fileThree")),
+																		 "f12df554b21e320be6471d7154130e70"})
+							 << QString()
+							 << true;
+		QTest::newRow("two") << MULTIMC_GET_TEST_FILE("tests/data/2.json")
+							 << (DownloadUpdateTask::VersionFileList()
+								 << DownloadUpdateTask::VersionFileEntry{"fileOne", 493,
+																		 (DownloadUpdateTask::FileSourceList() << DownloadUpdateTask::FileSource("http", "file://" + qApp->applicationDirPath() + "/tests/data/fileOneB")),
+																		 "42915a71277c9016668cce7b82c6b577"}
+								 << DownloadUpdateTask::VersionFileEntry{"fileTwo", 644,
+																		 (DownloadUpdateTask::FileSourceList() << DownloadUpdateTask::FileSource("http", "file://" + qApp->applicationDirPath() + "/tests/data/fileTwo")),
+																		 "38f94f54fa3eb72b0ea836538c10b043"})
+							 << QString()
+							 << true;
+	}
+	void test_parseVersionInfo()
+	{
+		QFETCH(QByteArray, data);
+		QFETCH(DownloadUpdateTask::VersionFileList, list);
+		QFETCH(QString, error);
+		QFETCH(bool, ret);
+
+		DownloadUpdateTask::VersionFileList outList;
+		QString outError;
+		bool outRet = DownloadUpdateTask("", 0).parseVersionInfo(data, &outList, &outError);
+		QCOMPARE(outRet, ret);
+		QCOMPARE(outList, list);
+		QCOMPARE(outError, error);
+	}
+
+	void test_processFileLists_data()
+	{
+		QTest::addColumn<DownloadUpdateTask *>("downloader");
+		QTest::addColumn<DownloadUpdateTask::VersionFileList>("currentVersion");
+		QTest::addColumn<DownloadUpdateTask::VersionFileList>("newVersion");
+		QTest::addColumn<DownloadUpdateTask::UpdateOperationList>("expectedOperations");
+
+		DownloadUpdateTask *downloader = new DownloadUpdateTask(QString(), -1);
+
+		// update fileOne, keep fileTwo, remove fileThree
+		QTest::newRow("test 1") << downloader
+				<< (DownloadUpdateTask::VersionFileList()
+					<< DownloadUpdateTask::VersionFileEntry{QFINDTESTDATA("tests/data/fileOne"), 493, DownloadUpdateTask::FileSourceList()
+															<< DownloadUpdateTask::FileSource("http", "http://host/path/fileOne-1"), "9eb84090956c484e32cb6c08455a667b"}
+					<< DownloadUpdateTask::VersionFileEntry{QFINDTESTDATA("tests/data/fileTwo"), 644, DownloadUpdateTask::FileSourceList()
+															<< DownloadUpdateTask::FileSource("http", "http://host/path/fileTwo-1"), "38f94f54fa3eb72b0ea836538c10b043"}
+					<< DownloadUpdateTask::VersionFileEntry{QFINDTESTDATA("tests/data/fileThree"), 420, DownloadUpdateTask::FileSourceList()
+															<< DownloadUpdateTask::FileSource("http", "http://host/path/fileThree-1"), "f12df554b21e320be6471d7154130e70"})
+				<< (DownloadUpdateTask::VersionFileList()
+					<< DownloadUpdateTask::VersionFileEntry{QFINDTESTDATA("tests/data/fileOne"), 493, DownloadUpdateTask::FileSourceList()
+															<< DownloadUpdateTask::FileSource("http", "http://host/path/fileOne-2"), "42915a71277c9016668cce7b82c6b577"}
+					<< DownloadUpdateTask::VersionFileEntry{QFINDTESTDATA("tests/data/fileTwo"), 644, DownloadUpdateTask::FileSourceList()
+															<< DownloadUpdateTask::FileSource("http", "http://host/path/fileTwo-2"), "38f94f54fa3eb72b0ea836538c10b043"})
+				<< (DownloadUpdateTask::UpdateOperationList()
+					<< DownloadUpdateTask::UpdateOperation::DeleteOp(QFINDTESTDATA("tests/data/fileThree"))
+					<< DownloadUpdateTask::UpdateOperation::CopyOp(PathCombine(downloader->updateFilesDir(), QFINDTESTDATA("tests/data/fileOne").replace("/", "_")),
+																   QFINDTESTDATA("tests/data/fileOne"), 493));
+	}
+	void test_processFileLists()
+	{
+		QFETCH(DownloadUpdateTask *, downloader);
+		QFETCH(DownloadUpdateTask::VersionFileList, currentVersion);
+		QFETCH(DownloadUpdateTask::VersionFileList, newVersion);
+		QFETCH(DownloadUpdateTask::UpdateOperationList, expectedOperations);
+
+		DownloadUpdateTask::UpdateOperationList operations;
+
+		downloader->processFileLists(new NetJob("Dummy"), currentVersion, newVersion, operations);
+		qDebug() << (operations == expectedOperations);
+		qDebug() << operations;
+		qDebug() << expectedOperations;
+		QCOMPARE(operations, expectedOperations);
+	}
+
+	void test_masterTest()
+	{
+		QLOG_INFO() << "#####################";
+		MMC->m_version.build = 1;
+		MMC->m_version.channel = "develop";
+		MMC->updateChecker()->setChannelListUrl(QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/channels.json")).toString());
+		MMC->updateChecker()->setCurrentChannel("develop");
+
+		DownloadUpdateTask task(QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/")).toString(), 2);
+
+		QSignalSpy succeededSpy(&task, SIGNAL(succeeded()));
+
+		task.start();
+
+		QVERIFY(succeededSpy.wait());
+	}
+};
+
+QTEST_GUILESS_MAIN_MULTIMC(DownloadUpdateTaskTest)
+
+#include "tst_DownloadUpdateTask.moc"
diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp
new file mode 100644
index 00000000..302473f7
--- /dev/null
+++ b/tests/tst_UpdateChecker.cpp
@@ -0,0 +1,158 @@
+#include <QTest>
+#include <QSignalSpy>
+
+#include "TestUtil.h"
+#include "logic/updater/UpdateChecker.h"
+
+Q_DECLARE_METATYPE(UpdateChecker::ChannelListEntry)
+
+bool operator==(const UpdateChecker::ChannelListEntry &e1, const UpdateChecker::ChannelListEntry &e2)
+{
+	return e1.id == e2.id &&
+			e1.name == e2.name &&
+			e1.description == e2.description &&
+			e1.url == e2.url;
+}
+
+class UpdateCheckerTest : public QObject
+{
+	Q_OBJECT
+private
+slots:
+	void initTestCase()
+	{
+
+	}
+	void cleanupTestCase()
+	{
+
+	}
+
+	static QString findTestDataUrl(const char *file)
+	{
+		return QUrl::fromLocalFile(QFINDTESTDATA(file)).toString();
+	}
+	void tst_ChannelListParsing_data()
+	{
+		QTest::addColumn<QString>("channel");
+		QTest::addColumn<QString>("channelUrl");
+		QTest::addColumn<bool>("hasChannels");
+		QTest::addColumn<bool>("valid");
+		QTest::addColumn<QList<UpdateChecker::ChannelListEntry> >("result");
+
+		QTest::newRow("garbage")
+				<< QString()
+				<< findTestDataUrl("tests/data/garbageChannels.json")
+				<< false
+				<< false
+				<< QList<UpdateChecker::ChannelListEntry>();
+		QTest::newRow("errors")
+				<< QString()
+				<< findTestDataUrl("tests/data/errorChannels.json")
+				<< false
+				<< true
+				<< QList<UpdateChecker::ChannelListEntry>();
+		QTest::newRow("no channels")
+				<< QString()
+				<< findTestDataUrl("tests/data/noChannels.json")
+				<< false
+				<< true
+				<< QList<UpdateChecker::ChannelListEntry>();
+		QTest::newRow("one channel")
+				<< QString("develop")
+				<< findTestDataUrl("tests/data/oneChannel.json")
+				<< true
+				<< true
+				<< (QList<UpdateChecker::ChannelListEntry>() << UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "http://example.org/stuff"});
+		QTest::newRow("several channels")
+				<< QString("develop")
+				<< findTestDataUrl("tests/data/channels.json")
+				<< true
+				<< true
+				<< (QList<UpdateChecker::ChannelListEntry>()
+					<< UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "http://example.org/stuff"}
+					<< UpdateChecker::ChannelListEntry{"stable", "Stable", "It's stable at least", "ftp://username@host/path/to/stuff"}
+					<< UpdateChecker::ChannelListEntry{"42", "The Channel", "This is the channel that is going to answer all of your questions", "https://dent.me/tea"});
+	}
+	void tst_ChannelListParsing()
+	{
+		QFETCH(QString, channel);
+		QFETCH(QString, channelUrl);
+		QFETCH(bool, hasChannels);
+		QFETCH(bool, valid);
+		QFETCH(QList<UpdateChecker::ChannelListEntry>, result);
+
+		UpdateChecker checker;
+
+		QSignalSpy channelListLoadedSpy(&checker, SIGNAL(channelListLoaded()));
+		QVERIFY(channelListLoadedSpy.isValid());
+
+		checker.setCurrentChannel(channel);
+		checker.setChannelListUrl(channelUrl);
+
+		checker.updateChanList();
+
+		if (valid)
+		{
+			QVERIFY(channelListLoadedSpy.wait());
+			QCOMPARE(channelListLoadedSpy.size(), 1);
+		}
+		else
+		{
+			channelListLoadedSpy.wait();
+			QCOMPARE(channelListLoadedSpy.size(), 0);
+		}
+
+
+		QCOMPARE(checker.hasChannels(), hasChannels);
+		QCOMPARE(checker.getChannelList(), result);
+	}
+
+	void tst_UpdateChecking_data()
+	{
+		QTest::addColumn<QString>("channel");
+		QTest::addColumn<QString>("channelUrl");
+		QTest::addColumn<int>("currentBuild");
+		QTest::addColumn<QList<QVariant> >("result");
+
+		QTest::newRow("valid channel")
+				<< "develop" << findTestDataUrl("tests/data/channels.json")
+				<< 2
+				<< (QList<QVariant>() << QString() << "1.0.3" << 3);
+	}
+
+	void tst_UpdateChecking()
+	{
+		QFETCH(QString, channel);
+		QFETCH(QString, channelUrl);
+		QFETCH(int, currentBuild);
+		QFETCH(QList<QVariant>, result);
+
+		MMC->m_version.build = currentBuild;
+
+		UpdateChecker checker;
+		checker.setCurrentChannel(channel);
+		checker.setChannelListUrl(channelUrl);
+
+		QSignalSpy updateAvailableSpy(&checker, SIGNAL(updateAvailable(QString,QString,int)));
+		QVERIFY(updateAvailableSpy.isValid());
+		QSignalSpy channelListLoadedSpy(&checker, SIGNAL(channelListLoaded()));
+		QVERIFY(channelListLoadedSpy.isValid());
+
+		checker.updateChanList();
+		QVERIFY(channelListLoadedSpy.wait());
+
+		checker.m_channels[0].url = QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/")).toString();
+
+		checker.checkForUpdate();
+
+		QVERIFY(updateAvailableSpy.wait());
+		QList<QVariant> res = result;
+		res[0] = checker.m_channels[0].url;
+		QCOMPARE(updateAvailableSpy.first(), res);
+	}
+};
+
+QTEST_GUILESS_MAIN_MULTIMC(UpdateCheckerTest)
+
+#include "tst_UpdateChecker.moc"