summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt10
-rw-r--r--tests/TestUtil.h3
-rw-r--r--tests/data/.gitattributes2
-rw-r--r--tests/data/1.json6
-rw-r--r--tests/data/2.json4
-rw-r--r--tests/data/CMakeLists.txt4
-rw-r--r--tests/data/channels.json2
-rw-r--r--tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml17
-rw-r--r--tests/test.manifest27
-rw-r--r--tests/test.rc28
-rw-r--r--tests/tst_DownloadUpdateTask.cpp194
-rw-r--r--tests/tst_UpdateChecker.cpp2
-rw-r--r--tests/tst_pathutils.cpp32
-rw-r--r--tests/tst_userutils.cpp7
14 files changed, 239 insertions, 99 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 14670fbd..2d851404 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,9 @@ macro(add_unit_test name)
unset(srcs)
foreach(arg ${testname} ${ARGN})
list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
+ if (WIN32)
+ list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/test.rc)
+ endif()
endforeach()
add_executable(tst_${name} ${srcs})
qt5_use_modules(tst_${name} Test Core Network Widgets)
@@ -81,4 +84,9 @@ if(MultiMC_CODE_COVERAGE)
add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML)
endif(MultiMC_CODE_COVERAGE)
-add_subdirectory(data)
+
+add_custom_target(MultiMC_Test_Data
+ ALL
+ COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/data
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data
+)
diff --git a/tests/TestUtil.h b/tests/TestUtil.h
index 5de8c4f2..fd25d24f 100644
--- a/tests/TestUtil.h
+++ b/tests/TestUtil.h
@@ -31,6 +31,9 @@ struct TestsInternal
# define _MMC_EXTRA_ARGV
# define _MMC_EXTRA_ARGC 0
#endif
+
+
+
#define QTEST_GUILESS_MAIN_MULTIMC(TestObject) \
int main(int argc, char *argv[]) \
{ \
diff --git a/tests/data/.gitattributes b/tests/data/.gitattributes
new file mode 100644
index 00000000..9ac803f0
--- /dev/null
+++ b/tests/data/.gitattributes
@@ -0,0 +1,2 @@
+* -text -diff
+
diff --git a/tests/data/1.json b/tests/data/1.json
index d5261d2c..f9f99b22 100644
--- a/tests/data/1.json
+++ b/tests/data/1.json
@@ -8,7 +8,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "file://$PWD/tests/data/fileOneA"
+ "Url": "$PWD/tests/data/fileOneA"
}
],
"Executable": true,
@@ -20,7 +20,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "file://$PWD/tests/data/fileTwo"
+ "Url": "$PWD/tests/data/fileTwo"
}
],
"Executable": false,
@@ -32,7 +32,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "file://$PWD/tests/data/fileThree"
+ "Url": "$PWD/tests/data/fileThree"
}
],
"Executable": false,
diff --git a/tests/data/2.json b/tests/data/2.json
index a96aff79..bb59b9b6 100644
--- a/tests/data/2.json
+++ b/tests/data/2.json
@@ -8,7 +8,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "file://$PWD/tests/data/fileOneB"
+ "Url": "$PWD/tests/data/fileOneB"
}
],
"Executable": true,
@@ -20,7 +20,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "file://$PWD/tests/data/fileTwo"
+ "Url": "$PWD/tests/data/fileTwo"
}
],
"Executable": false,
diff --git a/tests/data/CMakeLists.txt b/tests/data/CMakeLists.txt
deleted file mode 100644
index eee5a596..00000000
--- a/tests/data/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_custom_target(MultiMC_Test_Data
- ALL
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-)
diff --git a/tests/data/channels.json b/tests/data/channels.json
index e4f04bff..6bf65a82 100644
--- a/tests/data/channels.json
+++ b/tests/data/channels.json
@@ -5,7 +5,7 @@
"id": "develop",
"name": "Develop",
"description": "The channel called \"develop\"",
- "url": "file://$PWD/tests/data/"
+ "url": "$PWD/tests/data/"
},
{
"id": "stable",
diff --git a/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml b/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml
new file mode 100644
index 00000000..c79ef984
--- /dev/null
+++ b/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.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/test.manifest b/tests/test.manifest
new file mode 100644
index 00000000..8b4dbb98
--- /dev/null
+++ b/tests/test.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity name="MultiMC.Test.0" type="win32" version="5.0.0.0" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+ </dependentAssembly>
+ </dependency>
+ <description>Custom Minecraft launcher for managing multiple installs.</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates app support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates app support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!--The ID below indicates app support for Windows Developer Preview / Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ </application>
+ </compatibility>
+</assembly> \ No newline at end of file
diff --git a/tests/test.rc b/tests/test.rc
new file mode 100644
index 00000000..a288dba6
--- /dev/null
+++ b/tests/test.rc
@@ -0,0 +1,28 @@
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+1 RT_MANIFEST "test.manifest"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 1,0,0,0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "CompanyName", "MultiMC Contributors"
+ VALUE "FileDescription", "Testcase"
+ VALUE "FileVersion", "1.0.0.0"
+ VALUE "ProductName", "MultiMC Testcase"
+ VALUE "ProductVersion", "5"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0000, 0x04b0 // Unicode
+ END
+END
diff --git a/tests/tst_DownloadUpdateTask.cpp b/tests/tst_DownloadUpdateTask.cpp
index d96e4cf1..764af935 100644
--- a/tests/tst_DownloadUpdateTask.cpp
+++ b/tests/tst_DownloadUpdateTask.cpp
@@ -7,54 +7,73 @@
#include "logic/updater/UpdateChecker.h"
#include "depends/util/include/pathutils.h"
+DownloadUpdateTask::FileSourceList encodeBaseFile(const char *suffix)
+{
+ auto base = qApp->applicationDirPath();
+ QUrl localFile = QUrl::fromLocalFile(base + suffix);
+ QString localUrlString = localFile.toString(QUrl::FullyEncoded);
+ auto item = DownloadUpdateTask::FileSource("http", localUrlString);
+ return DownloadUpdateTask::FileSourceList({item});
+}
+
Q_DECLARE_METATYPE(DownloadUpdateTask::VersionFileList)
Q_DECLARE_METATYPE(DownloadUpdateTask::UpdateOperation)
-bool operator==(const DownloadUpdateTask::FileSource &f1, const DownloadUpdateTask::FileSource &f2)
+bool operator==(const DownloadUpdateTask::FileSource &f1,
+ const DownloadUpdateTask::FileSource &f2)
{
- return f1.type == f2.type &&
- f1.url == f2.url &&
- f1.compressionType == f2.compressionType;
+ return f1.type == f2.type && f1.url == f2.url && f1.compressionType == f2.compressionType;
}
-bool operator==(const DownloadUpdateTask::VersionFileEntry &v1, const DownloadUpdateTask::VersionFileEntry &v2)
+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;
+ 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)
+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;
+ 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 << ")";
+ 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 << ")";
+ 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;
+ 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 << ")";
+ dbg.nospace() << "UpdateOperation(type=" << u.type << " file=" << u.file
+ << " dest=" << u.dest << " mode=" << u.mode << ")";
return dbg.maybeSpace();
}
@@ -65,26 +84,30 @@ private
slots:
void initTestCase()
{
-
}
void cleanupTestCase()
{
-
}
void test_writeInstallScript()
{
- DownloadUpdateTask task(QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/")).toString(), 0);
+ 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");
-
+#if defined(Q_OS_WIN)
+ auto testFile = "tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml";
+#else
+ auto testFile = "tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml";
+#endif
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"));
+ QCOMPARE(TestsInternal::readFileUtf8(script).replace(QRegExp("[\r\n]+"), "\n"),
+ MULTIMC_GET_TEST_FILE_UTF8(testFile).replace(QRegExp("[\r\n]+"), "\n"));
}
void test_parseVersionInfo_data()
@@ -94,29 +117,34 @@ slots:
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;
+ QTest::newRow("one")
+ << MULTIMC_GET_TEST_FILE("tests/data/1.json")
+ << (DownloadUpdateTask::VersionFileList()
+ << DownloadUpdateTask::VersionFileEntry{"fileOne",
+ 493,
+ encodeBaseFile("/tests/data/fileOneA"),
+ "9eb84090956c484e32cb6c08455a667b"}
+ << DownloadUpdateTask::VersionFileEntry{"fileTwo",
+ 644,
+ encodeBaseFile("/tests/data/fileTwo"),
+ "38f94f54fa3eb72b0ea836538c10b043"}
+ << DownloadUpdateTask::VersionFileEntry{"fileThree",
+ 750,
+ encodeBaseFile("/tests/data/fileThree"),
+ "f12df554b21e320be6471d7154130e70"})
+ << QString() << true;
+ QTest::newRow("two")
+ << MULTIMC_GET_TEST_FILE("tests/data/2.json")
+ << (DownloadUpdateTask::VersionFileList()
+ << DownloadUpdateTask::VersionFileEntry{"fileOne",
+ 493,
+ encodeBaseFile("/tests/data/fileOneB"),
+ "42915a71277c9016668cce7b82c6b577"}
+ << DownloadUpdateTask::VersionFileEntry{"fileTwo",
+ 644,
+ encodeBaseFile("/tests/data/fileTwo"),
+ "38f94f54fa3eb72b0ea836538c10b043"})
+ << QString() << true;
}
void test_parseVersionInfo()
{
@@ -143,23 +171,45 @@ slots:
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));
+ QTest::newRow("test 1")
+ << downloader << (DownloadUpdateTask::VersionFileList()
+ << DownloadUpdateTask::VersionFileEntry{
+ "tests/data/fileOne", 493,
+ DownloadUpdateTask::FileSourceList()
+ << DownloadUpdateTask::FileSource(
+ "http", "http://host/path/fileOne-1"),
+ "9eb84090956c484e32cb6c08455a667b"}
+ << DownloadUpdateTask::VersionFileEntry{
+ "tests/data/fileTwo", 644,
+ DownloadUpdateTask::FileSourceList()
+ << DownloadUpdateTask::FileSource(
+ "http", "http://host/path/fileTwo-1"),
+ "38f94f54fa3eb72b0ea836538c10b043"}
+ << DownloadUpdateTask::VersionFileEntry{
+ "tests/data/fileThree", 420,
+ DownloadUpdateTask::FileSourceList()
+ << DownloadUpdateTask::FileSource(
+ "http", "http://host/path/fileThree-1"),
+ "f12df554b21e320be6471d7154130e70"})
+ << (DownloadUpdateTask::VersionFileList()
+ << DownloadUpdateTask::VersionFileEntry{
+ "tests/data/fileOne", 493,
+ DownloadUpdateTask::FileSourceList()
+ << DownloadUpdateTask::FileSource("http",
+ "http://host/path/fileOne-2"),
+ "42915a71277c9016668cce7b82c6b577"}
+ << DownloadUpdateTask::VersionFileEntry{
+ "tests/data/fileTwo", 644,
+ DownloadUpdateTask::FileSourceList()
+ << DownloadUpdateTask::FileSource("http",
+ "http://host/path/fileTwo-2"),
+ "38f94f54fa3eb72b0ea836538c10b043"})
+ << (DownloadUpdateTask::UpdateOperationList()
+ << DownloadUpdateTask::UpdateOperation::DeleteOp("tests/data/fileThree")
+ << DownloadUpdateTask::UpdateOperation::CopyOp(
+ PathCombine(downloader->updateFilesDir(),
+ QString("tests/data/fileOne").replace("/", "_")),
+ "tests/data/fileOne", 493));
}
void test_processFileLists()
{
@@ -170,7 +220,8 @@ slots:
DownloadUpdateTask::UpdateOperationList operations;
- downloader->processFileLists(new NetJob("Dummy"), currentVersion, newVersion, operations);
+ downloader->processFileLists(new NetJob("Dummy"), currentVersion, newVersion,
+ operations);
qDebug() << (operations == expectedOperations);
qDebug() << operations;
qDebug() << expectedOperations;
@@ -182,10 +233,15 @@ slots:
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());
+ auto channels =
+ QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/channels.json"));
+ auto root = QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/"));
+ QLOG_DEBUG() << "channels: " << channels;
+ QLOG_DEBUG() << "root: " << root;
+ MMC->updateChecker()->setChannelListUrl(channels.toString());
MMC->updateChecker()->setCurrentChannel("develop");
- DownloadUpdateTask task(QUrl::fromLocalFile(QDir::current().absoluteFilePath("tests/data/")).toString(), 2);
+ DownloadUpdateTask task(root.toString(), 2);
QSignalSpy succeededSpy(&task, SIGNAL(succeeded()));
diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp
index 0f023f0e..af3ae802 100644
--- a/tests/tst_UpdateChecker.cpp
+++ b/tests/tst_UpdateChecker.cpp
@@ -76,7 +76,7 @@ slots:
<< true
<< true
<< (QList<UpdateChecker::ChannelListEntry>()
- << UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "file://$PWD/tests/data/"}
+ << UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "$PWD/tests/data/"}
<< 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"});
}
diff --git a/tests/tst_pathutils.cpp b/tests/tst_pathutils.cpp
index 1e4a83bf..a1310d00 100644
--- a/tests/tst_pathutils.cpp
+++ b/tests/tst_pathutils.cpp
@@ -23,13 +23,12 @@ slots:
QTest::addColumn<QString>("path1");
QTest::addColumn<QString>("path2");
-#if defined(Q_OS_UNIX)
- QTest::newRow("unix 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
- QTest::newRow("unix 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
-#elif defined(Q_OS_WIN)
- QTest::newRow("win, from C:") << "C:\\abc" << "C:" << "abc\\def";
- QTest::newRow("win 1") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\def" << "ghi\\jkl";
- QTest::newRow("win 2") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
+ QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
+ QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
+#if defined(Q_OS_WIN)
+ QTest::newRow("win native, from C:") << "C:/abc" << "C:" << "abc";
+ QTest::newRow("win native 1") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def" << "ghi\\jkl";
+ QTest::newRow("win native 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
#endif
}
void test_PathCombine1()
@@ -48,16 +47,15 @@ slots:
QTest::addColumn<QString>("path2");
QTest::addColumn<QString>("path3");
-#if defined(Q_OS_UNIX)
- QTest::newRow("unix 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
- QTest::newRow("unix 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
- QTest::newRow("unix 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
- QTest::newRow("unix 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
-#elif defined(Q_OS_WIN)
- QTest::newRow("win 1") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc" << "def" << "ghi\\jkl";
- QTest::newRow("win 2") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
- QTest::newRow("win 3") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
- QTest::newRow("win 4") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+ QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
+ QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
+ QTest::newRow("qt 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
+ QTest::newRow("qt 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
+#if defined(Q_OS_WIN)
+ QTest::newRow("win 1") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def" << "ghi\\jkl";
+ QTest::newRow("win 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+ QTest::newRow("win 3") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
+ QTest::newRow("win 4") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
#endif
}
void test_PathCombine2()
diff --git a/tests/tst_userutils.cpp b/tests/tst_userutils.cpp
index 62bee985..3bc980c0 100644
--- a/tests/tst_userutils.cpp
+++ b/tests/tst_userutils.cpp
@@ -23,6 +23,9 @@ slots:
QCOMPARE(Util::getDesktopDir(), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
}
+// this is only valid on linux
+// FIXME: implement on windows, OSX, then test.
+#if defined(Q_OS_LINUX)
void test_createShortcut_data()
{
QTest::addColumn<QString>("location");
@@ -40,7 +43,7 @@ slots:
#if defined(Q_OS_LINUX)
<< MULTIMC_GET_TEST_FILE("data/tst_userutils-test_createShortcut-unix")
#elif defined(Q_OS_WIN)
- << QString()
+ << QByteArray()
#endif
;
}
@@ -59,8 +62,10 @@ slots:
//QDir().remove(location);
}
+#endif
};
+
QTEST_GUILESS_MAIN_MULTIMC(UserUtilsTest)
#include "tst_userutils.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 15:28:34 +0000