NOISSUE finalize support for new mojang version format

5 files changed, 305 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1061f911..67a7a45e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,6 +27,7 @@ add_unit_test(userutils tst_userutils.cpp)
 add_unit_test(modutils tst_modutils.cpp)
 add_unit_test(inifile tst_inifile.cpp)
 add_unit_test(FileSystem tst_FileSystem.cpp)
+add_unit_test(Library tst_Library.cpp)
 add_unit_test(UpdateChecker tst_UpdateChecker.cpp)
 add_unit_test(DownloadTask tst_DownloadTask.cpp)
 add_unit_test(filematchers tst_filematchers.cpp)
diff --git a/tests/data/lib-native-arch.json b/tests/data/lib-native-arch.json
new file mode 100644
index 00000000..a73aac54
--- /dev/null
+++ b/tests/data/lib-native-arch.json
@@ -0,0 +1,46 @@
+{
+	"downloads": {
+		"classifiers": {
+			"natives-osx": {
+				"path": "tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-osx.jar",
+				"sha1": "62503ee712766cf77f97252e5902786fd834b8c5",
+				"size": 418331,
+				"url": "https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-osx.jar"
+			},
+			"natives-windows-32": {
+				"path": "tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-32.jar",
+				"sha1": "7c6affe439099806a4f552da14c42f9d643d8b23",
+				"size": 386792,
+				"url": "https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-32.jar"
+			},
+			"natives-windows-64": {
+				"path": "tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-64.jar",
+				"sha1": "39d0c3d363735b4785598e0e7fbf8297c706a9f9",
+				"size": 463390,
+				"url": "https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-64.jar"
+			}
+		}
+	},
+	"extract": {
+		"exclude": [
+			"META-INF/"
+		]
+	},
+	"name": "tv.twitch:twitch-platform:5.16",
+	"natives": {
+		"linux": "natives-linux",
+		"osx": "natives-osx",
+		"windows": "natives-windows-${arch}"
+	},
+	"rules": [
+		{
+			"action": "allow"
+		},
+		{
+			"action": "disallow",
+			"os": {
+				"name": "linux"
+			}
+		}
+	]
+}
diff --git a/tests/data/lib-native.json b/tests/data/lib-native.json
new file mode 100644
index 00000000..0a95b2b9
--- /dev/null
+++ b/tests/data/lib-native.json
@@ -0,0 +1,52 @@
+{
+	"downloads": {
+		"artifact": {
+			"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
+			"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
+			"size": 22,
+			"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
+		},
+		"classifiers": {
+			"natives-linux": {
+				"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
+				"sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
+				"size": 578680,
+				"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
+			},
+			"natives-osx": {
+				"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
+				"sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
+				"size": 426822,
+				"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
+			},
+			"natives-windows": {
+				"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
+				"sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
+				"size": 613748,
+				"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
+			}
+		}
+	},
+	"extract": {
+		"exclude": [
+			"META-INF/"
+		]
+	},
+	"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+	"natives": {
+		"linux": "natives-linux",
+		"osx": "natives-osx",
+		"windows": "natives-windows"
+	},
+	"rules": [
+		{
+			"action": "allow"
+		},
+		{
+			"action": "disallow",
+			"os": {
+				"name": "osx"
+			}
+		}
+	]
+}
diff --git a/tests/data/lib-simple.json b/tests/data/lib-simple.json
new file mode 100644
index 00000000..3ef0f490
--- /dev/null
+++ b/tests/data/lib-simple.json
@@ -0,0 +1,11 @@
+{
+	"downloads": {
+		"artifact": {
+			"path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
+			"sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
+			"size": 5618,
+			"url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
+		}
+	},
+	"name": "com.paulscode:codecwav:20101023"
+}
diff --git a/tests/tst_Library.cpp b/tests/tst_Library.cpp
new file mode 100644
index 00000000..b5840261
--- /dev/null
+++ b/tests/tst_Library.cpp
@@ -0,0 +1,195 @@
+#include <QTest>
+#include "TestUtil.h"
+
+#include "minecraft/MojangVersionFormat.h"
+#include "minecraft/onesix/OneSixVersionFormat.h"
+#include "minecraft/Library.h"
+#include "net/HttpMetaCache.h"
+#include "FileSystem.h"
+
+class LibraryTest : public QObject
+{
+	Q_OBJECT
+private:
+	LibraryPtr readMojangJson(const char *file)
+	{
+		auto path = QFINDTESTDATA(file);
+		QFile jsonFile(path);
+		jsonFile.open(QIODevice::ReadOnly);
+		auto data = jsonFile.readAll();
+		jsonFile.close();
+		return MojangVersionFormat::libraryFromJson(QJsonDocument::fromJson(data).object(), file);
+	}
+	// get absolute path to expected storage, assuming default cache prefix
+	QStringList getStorage(QString relative)
+	{
+		return {FS::PathCombine(cache->getBasePath("libraries"), relative)};
+	}
+private
+slots:
+	void initTestCase()
+	{
+		cache.reset(new HttpMetaCache());
+		cache->addBase("libraries", QDir("libraries").absolutePath());
+	}
+	void test_legacy()
+	{
+		Library test("test.package:testname:testversion");
+		QCOMPARE(test.artifactPrefix(), QString("test.package:testname"));
+		QCOMPARE(test.isNative(), false);
+
+		QStringList jar, native, native32, native64;
+		test.getApplicableFiles(currentSystem, jar, native, native32, native64);
+		QCOMPARE(jar, getStorage("test/package/testname/testversion/testname-testversion.jar"));
+		QCOMPARE(native, {});
+		QCOMPARE(native32, {});
+		QCOMPARE(native64, {});
+	}
+	void test_legacy_url()
+	{
+		QStringList failedFiles;
+		Library test("test.package:testname:testversion");
+		test.setRepositoryURL("file://foo/bar");
+		auto downloads = test.getDownloads(currentSystem, cache.get(), failedFiles);
+		QCOMPARE(downloads.size(), 1);
+		QCOMPARE(failedFiles, {});
+		NetActionPtr dl = downloads[0];
+		QCOMPARE(dl->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion.jar"));
+	}
+	void test_legacy_url_local_broken()
+	{
+		Library test("test.package:testname:testversion");
+		QCOMPARE(test.isNative(), false);
+		QStringList failedFiles;
+		test.setHint("local");
+		auto downloads = test.getDownloads(currentSystem, cache.get(), failedFiles);
+		QCOMPARE(downloads.size(), 0);
+		QCOMPARE(failedFiles, getStorage("test/package/testname/testversion/testname-testversion.jar"));
+	}
+	void test_legacy_native()
+	{
+		Library test("test.package:testname:testversion");
+		test.m_nativeClassifiers[OpSys::Os_Linux]="linux";
+		QCOMPARE(test.isNative(), true);
+		test.setRepositoryURL("file://foo/bar");
+		{
+			QStringList jar, native, native32, native64;
+			test.getApplicableFiles(Os_Linux, jar, native, native32, native64);
+			QCOMPARE(jar, {});
+			QCOMPARE(native, getStorage("test/package/testname/testversion/testname-testversion-linux.jar"));
+			QCOMPARE(native32, {});
+			QCOMPARE(native64, {});
+			QStringList failedFiles;
+			auto dls = test.getDownloads(Os_Linux, cache.get(), failedFiles);
+			QCOMPARE(dls.size(), 1);
+			QCOMPARE(failedFiles, {});
+			auto dl = dls[0];
+			QCOMPARE(dl->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux.jar"));
+		}
+	}
+	void test_legacy_native_arch()
+	{
+		Library test("test.package:testname:testversion");
+		test.m_nativeClassifiers[OpSys::Os_Linux]="linux-${arch}";
+		test.m_nativeClassifiers[OpSys::Os_OSX]="osx-${arch}";
+		test.m_nativeClassifiers[OpSys::Os_Windows]="windows-${arch}";
+		QCOMPARE(test.isNative(), true);
+		test.setRepositoryURL("file://foo/bar");
+		{
+			QStringList jar, native, native32, native64;
+			test.getApplicableFiles(Os_Linux, jar, native, native32, native64);
+			QCOMPARE(jar, {});
+			QCOMPARE(native, {});
+			QCOMPARE(native32, getStorage("test/package/testname/testversion/testname-testversion-linux-32.jar"));
+			QCOMPARE(native64, getStorage("test/package/testname/testversion/testname-testversion-linux-64.jar"));
+			QStringList failedFiles;
+			auto dls = test.getDownloads(Os_Linux, cache.get(), failedFiles);
+			QCOMPARE(dls.size(), 2);
+			QCOMPARE(failedFiles, {});
+			QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-32.jar"));
+			QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-64.jar"));
+		}
+		{
+			QStringList jar, native, native32, native64;
+			test.getApplicableFiles(Os_Windows, jar, native, native32, native64);
+			QCOMPARE(jar, {});
+			QCOMPARE(native, {});
+			QCOMPARE(native32, getStorage("test/package/testname/testversion/testname-testversion-windows-32.jar"));
+			QCOMPARE(native64, getStorage("test/package/testname/testversion/testname-testversion-windows-64.jar"));
+			QStringList failedFiles;
+			auto dls = test.getDownloads(Os_Windows, cache.get(), failedFiles);
+			QCOMPARE(dls.size(), 2);
+			QCOMPARE(failedFiles, {});
+			QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-32.jar"));
+			QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-64.jar"));
+		}
+		{
+			QStringList jar, native, native32, native64;
+			test.getApplicableFiles(Os_OSX, jar, native, native32, native64);
+			QCOMPARE(jar, {});
+			QCOMPARE(native, {});
+			QCOMPARE(native32, getStorage("test/package/testname/testversion/testname-testversion-osx-32.jar"));
+			QCOMPARE(native64, getStorage("test/package/testname/testversion/testname-testversion-osx-64.jar"));
+			QStringList failedFiles;
+			auto dls = test.getDownloads(Os_OSX, cache.get(), failedFiles);
+			QCOMPARE(dls.size(), 2);
+			QCOMPARE(failedFiles, {});
+			QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-32.jar"));
+			QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-64.jar"));
+		}
+	}
+	void test_onenine()
+	{
+		auto test = readMojangJson("data/lib-simple.json");
+		QStringList jar, native, native32, native64;
+		test->getApplicableFiles(Os_OSX, jar, native, native32, native64);
+		QCOMPARE(jar, getStorage("com/paulscode/codecwav/20101023/codecwav-20101023.jar"));
+		QCOMPARE(native, {});
+		QCOMPARE(native32, {});
+		QCOMPARE(native64, {});
+		QStringList failedFiles;
+		auto dls = test->getDownloads(Os_Linux, cache.get(), failedFiles);
+		QCOMPARE(dls.size(), 1);
+		QCOMPARE(failedFiles, {});
+		QCOMPARE(dls[0]->m_url, QUrl("https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"));
+	}
+	void test_onenine_native()
+	{
+		auto test = readMojangJson("data/lib-native.json");
+		QStringList jar, native, native32, native64;
+		test->getApplicableFiles(Os_OSX, jar, native, native32, native64);
+		QCOMPARE(jar, getStorage("org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"));
+		QCOMPARE(native, getStorage("org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"));
+		QCOMPARE(native32, {});
+		QCOMPARE(native64, {});
+		QStringList failedFiles;
+		auto dls = test->getDownloads(Os_OSX, cache.get(), failedFiles);
+		QCOMPARE(dls.size(), 2);
+		QCOMPARE(failedFiles, {});
+		QCOMPARE(dls[0]->m_url, QUrl("https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"));
+		QCOMPARE(dls[1]->m_url, QUrl("https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"));
+	}
+	void test_onenine_native_arch()
+	{
+		auto test = readMojangJson("data/lib-native-arch.json");
+		QStringList jar, native, native32, native64;
+		test->getApplicableFiles(Os_Windows, jar, native, native32, native64);
+		QCOMPARE(jar, {});
+		QCOMPARE(native, {});
+		QCOMPARE(native32, getStorage("tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-32.jar"));
+		QCOMPARE(native64, getStorage("tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-64.jar"));
+		QStringList failedFiles;
+		auto dls = test->getDownloads(Os_Windows, cache.get(), failedFiles);
+		QCOMPARE(dls.size(), 2);
+		QCOMPARE(failedFiles, {});
+		QCOMPARE(dls[0]->m_url, QUrl("https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-32.jar"));
+		QCOMPARE(dls[1]->m_url, QUrl("https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-64.jar"));
+	}
+private:
+	std::unique_ptr<HttpMetaCache> cache;
+	QString workDir;
+};
+
+QTEST_GUILESS_MAIN(LibraryTest)
+
+#include "tst_Library.moc"