diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | tests/tst_DownloadTask.cpp | 8 | ||||
| -rw-r--r-- | tests/tst_UpdateChecker.cpp | 2 | ||||
| -rw-r--r-- | tests/tst_gradlespecifier.cpp | 2 | ||||
| -rw-r--r-- | tests/tst_inifile.cpp | 2 | ||||
| -rw-r--r-- | tests/tst_pathutils.cpp | 2 | ||||
| -rw-r--r-- | tests/tst_userutils.cpp | 2 |
7 files changed, 15 insertions, 14 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e891c379..2cf9e7cb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,8 @@ # run the unit tests with `make test` find_package(Qt5 COMPONENTS Test Core Network) -include_directories(${MMC_SRC}) +include_directories(../logic) +include_directories(../depends/util/include/) unset(MultiMC_TESTS) macro(add_unit_test name) @@ -14,7 +15,7 @@ macro(add_unit_test name) endforeach() add_executable(tst_${name} ${srcs}) qt5_use_modules(tst_${name} Test Core Network) - target_link_libraries(tst_${name} MultiMC_common) + target_link_libraries(tst_${name} MultiMC_logic) list(APPEND MultiMC_TESTS tst_${name}) add_test(NAME ${name} COMMAND tst_${name}) endmacro() @@ -38,9 +39,9 @@ set(COVERAGE_SOURCE_DIRS ${MMC_SRC}/logic/lists/* ${MMC_SRC}/logic/net/* ${MMC_SRC}/logic/tasks/* - ${MMC_SRC}/gui/* - ${MMC_SRC}/gui/dialogs/* - ${MMC_SRC}/gui/widgets/* + ${MMC_SRC}/application/* + ${MMC_SRC}/application/dialogs/* + ${MMC_SRC}/application/widgets/* ${MMC_SRC}/depends/settings/include/* ${MMC_SRC}/depends/settings/src/* ${MMC_SRC}/depends/util/include/* diff --git a/tests/tst_DownloadTask.cpp b/tests/tst_DownloadTask.cpp index 9c87b027..9482b666 100644 --- a/tests/tst_DownloadTask.cpp +++ b/tests/tst_DownloadTask.cpp @@ -3,10 +3,10 @@ #include "TestUtil.h" -#include "logic/updater/GoUpdate.h" -#include "logic/updater/DownloadTask.h" -#include "logic/updater/UpdateChecker.h" -#include "depends/util/include/pathutils.h" +#include "updater/GoUpdate.h" +#include "updater/DownloadTask.h" +#include "updater/UpdateChecker.h" +#include "pathutils.h" using namespace GoUpdate; diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp index d212f79b..42d44e77 100644 --- a/tests/tst_UpdateChecker.cpp +++ b/tests/tst_UpdateChecker.cpp @@ -2,7 +2,7 @@ #include <QSignalSpy> #include "TestUtil.h" -#include "logic/updater/UpdateChecker.h" +#include "updater/UpdateChecker.h" Q_DECLARE_METATYPE(UpdateChecker::ChannelListEntry) diff --git a/tests/tst_gradlespecifier.cpp b/tests/tst_gradlespecifier.cpp index 56c29b85..146c9838 100644 --- a/tests/tst_gradlespecifier.cpp +++ b/tests/tst_gradlespecifier.cpp @@ -1,7 +1,7 @@ #include <QTest> #include "TestUtil.h" -#include "logic/minecraft/GradleSpecifier.h" +#include "minecraft/GradleSpecifier.h" class GradleSpecifierTest : public QObject { diff --git a/tests/tst_inifile.cpp b/tests/tst_inifile.cpp index 6bec32f5..94b5e559 100644 --- a/tests/tst_inifile.cpp +++ b/tests/tst_inifile.cpp @@ -1,7 +1,7 @@ #include <QTest> #include "TestUtil.h" -#include "logic/settings/INIFile.h" +#include "settings/INIFile.h" class IniFileTest : public QObject { diff --git a/tests/tst_pathutils.cpp b/tests/tst_pathutils.cpp index eed5b560..bccc6dca 100644 --- a/tests/tst_pathutils.cpp +++ b/tests/tst_pathutils.cpp @@ -1,7 +1,7 @@ #include <QTest> #include "TestUtil.h" -#include "depends/util/include/pathutils.h" +#include "pathutils.h" class PathUtilsTest : public QObject { diff --git a/tests/tst_userutils.cpp b/tests/tst_userutils.cpp index 893e064e..bc7644f3 100644 --- a/tests/tst_userutils.cpp +++ b/tests/tst_userutils.cpp @@ -2,7 +2,7 @@ #include <QStandardPaths> #include "TestUtil.h" -#include "depends/util/include/userutils.h" +#include "userutils.h" class UserUtilsTest : public QObject { |