Sync from quickmods

3 files changed, 172 insertions, 17 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d56988e0..7afb3f80 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,6 +24,7 @@ endmacro()
 add_unit_test(pathutils tst_pathutils.cpp)
 add_unit_test(gradlespecifier tst_gradlespecifier.cpp)
 add_unit_test(userutils tst_userutils.cpp)
+add_unit_test(modutils tst_modutils.cpp)
 add_unit_test(inifile tst_inifile.cpp)
 add_unit_test(UpdateChecker tst_UpdateChecker.cpp)
 add_unit_test(DownloadUpdateTask tst_DownloadUpdateTask.cpp)
diff --git a/tests/TestUtil.h b/tests/TestUtil.h
index e7017743..87a910d9 100644
--- a/tests/TestUtil.h
+++ b/tests/TestUtil.h
@@ -9,29 +9,30 @@
 
 #include "test_config.h"
 
-struct TestsInternal
+class TestsInternal
 {
-        static QByteArray readFile(const QString &fileName)
-        {
-                QFile f(fileName);
-                f.open(QFile::ReadOnly);
-                return f.readAll();
-        }
-		static QString readFileUtf8(const QString &fileName)
-		{
-			return QString::fromUtf8(readFile(fileName));
-		}
+public:
+	static QByteArray readFile(const QString &fileName)
+	{
+		QFile f(fileName);
+		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 MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA(file))
+#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA(file))
 
 #ifdef Q_OS_LINUX
-# define _MMC_EXTRA_ARGV , "-platform", "offscreen"
-# define _MMC_EXTRA_ARGC 2
+#define _MMC_EXTRA_ARGV , "-platform", "offscreen"
+#define _MMC_EXTRA_ARGC 2
 #else
-# define _MMC_EXTRA_ARGV
-# define _MMC_EXTRA_ARGC 0
+#define _MMC_EXTRA_ARGV
+#define _MMC_EXTRA_ARGC 0
 #endif
 	
 	
diff --git a/tests/tst_modutils.cpp b/tests/tst_modutils.cpp
new file mode 100644
index 00000000..e49548bc
--- /dev/null
+++ b/tests/tst_modutils.cpp
@@ -0,0 +1,153 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <QTest>
+
+#include "modutils.h"
+#include "TestUtil.h"
+
+class ModUtilsTest : public QObject
+{
+	Q_OBJECT
+	void setupVersions()
+	{
+		QTest::addColumn<QString>("first");
+		QTest::addColumn<QString>("second");
+		QTest::addColumn<bool>("lessThan");
+		QTest::addColumn<bool>("equal");
+
+		QTest::newRow("equal, explicit") << "1.2.0" << "1.2.0" << false << true;
+		QTest::newRow("equal, implicit 1") << "1.2" << "1.2.0" << false << true;
+		QTest::newRow("equal, implicit 2") << "1.2.0" << "1.2" << false << true;
+		QTest::newRow("equal, two-digit") << "1.42" << "1.42" << false << true;
+
+		QTest::newRow("lessThan, explicit 1") << "1.2.0" << "1.2.1" << true << false;
+		QTest::newRow("lessThan, explicit 2") << "1.2.0" << "1.3.0" << true << false;
+		QTest::newRow("lessThan, explicit 3") << "1.2.0" << "2.2.0" << true << false;
+		QTest::newRow("lessThan, implicit 1") << "1.2" << "1.2.1" << true << false;
+		QTest::newRow("lessThan, implicit 2") << "1.2" << "1.3.0" << true << false;
+		QTest::newRow("lessThan, implicit 3") << "1.2" << "2.2.0" << true << false;
+		QTest::newRow("lessThan, two-digit") << "1.41" << "1.42" << true << false;
+
+		QTest::newRow("greaterThan, explicit 1") << "1.2.1" << "1.2.0" << false << false;
+		QTest::newRow("greaterThan, explicit 2") << "1.3.0" << "1.2.0" << false << false;
+		QTest::newRow("greaterThan, explicit 3") << "2.2.0" << "1.2.0" << false << false;
+		QTest::newRow("greaterThan, implicit 1") << "1.2.1" << "1.2" << false << false;
+		QTest::newRow("greaterThan, implicit 2") << "1.3.0" << "1.2" << false << false;
+		QTest::newRow("greaterThan, implicit 3") << "2.2.0" << "1.2" << false << false;
+		QTest::newRow("greaterThan, two-digit") << "1.42" << "1.41" << false << false;
+	}
+
+private slots:
+	void initTestCase()
+	{
+
+	}
+	void cleanupTestCase()
+	{
+
+	}
+
+	void test_versionIsInInterval_data()
+	{
+		QTest::addColumn<QString>("version");
+		QTest::addColumn<QString>("interval");
+		QTest::addColumn<bool>("result");
+
+		QTest::newRow("empty, true") << "1.2.3" << "" << true;
+		QTest::newRow("one version, true") << "1.2.3" << "1.2.3" << true;
+		QTest::newRow("one version, false") << "1.2.3" << "1.2.2" << false;
+
+		QTest::newRow("one version inclusive <-> infinity, true") << "1.2.3" << "[1.2.3,)" << true;
+		QTest::newRow("one version exclusive <-> infinity, true") << "1.2.3" << "(1.2.2,)" << true;
+		QTest::newRow("one version inclusive <-> infitity, false") << "1.2.3" << "[1.2.4,)" << false;
+		QTest::newRow("one version exclusive <-> infinity, false") << "1.2.3" << "(1.2.3,)" << false;
+
+		QTest::newRow("infinity <-> one version inclusive, true") << "1.2.3" << "(,1.2.3]" << true;
+		QTest::newRow("infinity <-> one version exclusive, true") << "1.2.3" << "(,1.2.4)" << true;
+		QTest::newRow("infinity <-> one version inclusive, false") << "1.2.3" << "(,1.2.2]" << false;
+		QTest::newRow("infinity <-> one version exclusive, false") << "1.2.3" << "(,1.2.3)" << false;
+
+		QTest::newRow("inclusive <-> inclusive, true") << "1.2.3" << "[1.2.2,1.2.3]" << true;
+		QTest::newRow("inclusive <-> exclusive, true") << "1.2.3" << "[1.2.3,1.2.4)" << true;
+		QTest::newRow("exclusive <-> inclusive, true") << "1.2.3" << "(1.2.2,1.2.3]" << true;
+		QTest::newRow("exclusive <-> exclusive, true") << "1.2.3" << "(1.2.2,1.2.4)" << true;
+		QTest::newRow("inclusive <-> inclusive, false") << "1.2.3" << "[1.0.0,1.2.2]" << false;
+		QTest::newRow("inclusive <-> exclusive, false") << "1.2.3" << "[1.0.0,1.2.3)" << false;
+		QTest::newRow("exclusive <-> inclusive, false") << "1.2.3" << "(1.2.3,2.0.0]" << false;
+		QTest::newRow("exclusive <-> exclusive, false") << "1.2.3" << "(1.0.0,1.2.3)" << false;
+	}
+	void test_versionIsInInterval()
+	{
+		QFETCH(QString, version);
+		QFETCH(QString, interval);
+		QFETCH(bool, result);
+
+		QCOMPARE(Util::versionIsInInterval(version, interval), result);
+	}
+
+	void test_versionCompareLessThan_data()
+	{
+		setupVersions();
+	}
+	void test_versionCompareLessThan()
+	{
+		QFETCH(QString, first);
+		QFETCH(QString, second);
+		QFETCH(bool, lessThan);
+		QFETCH(bool, equal);
+
+		const auto v1 = Util::Version(first);
+		const auto v2 = Util::Version(second);
+
+		QCOMPARE(v1 < v2, lessThan);
+	}
+	void test_versionCompareGreaterThan_data()
+	{
+		setupVersions();
+	}
+	void test_versionCompareGreaterThan()
+	{
+		QFETCH(QString, first);
+		QFETCH(QString, second);
+		QFETCH(bool, lessThan);
+		QFETCH(bool, equal);
+
+		const auto v1 = Util::Version(first);
+		const auto v2 = Util::Version(second);
+
+		QCOMPARE(v1 > v2, !lessThan && !equal);
+	}
+	void test_versionCompareEqual_data()
+	{
+		setupVersions();
+	}
+	void test_versionCompareEqual()
+	{
+		QFETCH(QString, first);
+		QFETCH(QString, second);
+		QFETCH(bool, lessThan);
+		QFETCH(bool, equal);
+
+		const auto v1 = Util::Version(first);
+		const auto v2 = Util::Version(second);
+
+		QCOMPARE(v1 == v2, equal);
+	}
+};
+
+QTEST_GUILESS_MAIN(ModUtilsTest)
+
+#include "tst_modutils.moc"