From 1be7d573326570d63e55e36235537ed2b1831ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 10 Apr 2016 17:01:24 +0200 Subject: NOISSUE re/move some dead code and unused build system parts --- tests/CMakeLists.txt | 60 +------------------------ tests/tst_Resource.cpp | 116 ------------------------------------------------- 2 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 tests/tst_Resource.cpp (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 409462a2..12fa4108 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,7 +20,7 @@ macro(add_unit_test name) add_test(NAME ${name} COMMAND tst_${name}) endmacro() -# Tests START # +# Tests BEGIN # add_unit_test(gradlespecifier tst_gradlespecifier.cpp) add_unit_test(userutils tst_userutils.cpp) @@ -32,7 +32,7 @@ add_unit_test(UpdateChecker tst_UpdateChecker.cpp) add_unit_test(DownloadTask tst_DownloadTask.cpp) add_unit_test(filematchers tst_filematchers.cpp) add_unit_test(ModList tst_ModList.cpp) -add_unit_test(Resource tst_Resource.cpp) +# add_unit_test(Resource tst_Resource.cpp) add_unit_test(GZip tst_GZip.cpp) add_unit_test(JavaVersion tst_JavaVersion.cpp) add_unit_test(ParseUtils tst_ParseUtils.cpp) @@ -44,62 +44,6 @@ add_unit_test(WonkoIndex tst_WonkoIndex.cpp) # Tests END # -set(COVERAGE_SOURCE_DIRS - ${MMC_SRC}/logic/* - ${MMC_SRC}/logic/auth/* - ${MMC_SRC}/logic/auth/flows/* - ${MMC_SRC}/logic/lists/* - ${MMC_SRC}/logic/net/* - ${MMC_SRC}/logic/tasks/* - ${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/* - ${MMC_SRC}/depends/util/src/* -) - -if(MultiMC_CODE_COVERAGE) - unset(MultiMC_RUN_TESTS) - unset(MultiMC_TEST_COVERAGE_FILES) - - foreach(test ${MultiMC_TESTS}) - add_custom_target(MultiMC_RUN_TEST_${test} - COMMAND lcov -d ${CMAKE_CURRENT_BINARY_DIR} -z -q # clean test - && lcov -d ${MMC_BIN} -z -q # clean common - && lcov -d ${MMC_BIN}/depends/settings/CMakeFiles/libSettings.dir -z -q # clean settings - && lcov -d ${MMC_BIN}/depends/utils/CMakeFiles/libUtil.dir -z -q # clean utils - && ${MMC_BIN}/${test} -o coverage_${test}.out,xml # run test - && lcov -q --checksum -b ${MMC_SRC} -d ${CMAKE_CURRENT_BINARY_DIR} -c -o coverage_${test}.info # generate for test - && lcov -q --checksum -b ${MMC_SRC} -d ${MMC_BIN} -c -o coverage_common.info # generate for common - && lcov -q --checksum -b ${MMC_SRC} -d ${MMC_BIN}/depends/settings/CMakeFiles/libSettings.dir -c -o coverage_settings.info # generate for settings - && lcov -q --checksum -b ${MMC_SRC} -d ${MMC_BIN}/depends/util/CMakeFiles/libUtil.dir -c -o coverage_utils.info # generate for utils - && lcov -q --checksum -b ${MMC_SRC} -d . - -a coverage_${test}.info -a coverage_common.info -a coverage_settings.info -a coverage_utils.info - -o coverage_${test}-combined.info # combine test and common - && lcov -q --checksum -b ${MMC_SRC} --list-full-path --extract coverage_${test}-combined.info ${COVERAGE_SOURCE_DIRS} -o coverage_${test}-stripped.info # strip - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - VERBATIM - DEPENDS ${test} - COMMENT "Running ${test}..." - ) - list(APPEND MultiMC_TEST_COVERAGE_FILES coverage_${test}-stripped.info) - list(APPEND MultiMC_RUN_TESTS MultiMC_RUN_TEST_${test}) - endforeach(test) - - add_custom_target(MultiMC_GENERATE_COVERAGE - DEPENDS ${MultiMC_RUN_TESTS} - COMMENT "Generating coverage files..." - ) - add_custom_target(MultiMC_GENERATE_COVERAGE_HTML - COMMAND genhtml -t "MultiMC 5 Test Coverage" --num-spaces 4 --demangle-cpp --legend -o ${MMC_SRC}/html/coverage ${MultiMC_TEST_COVERAGE_FILES} - DEPENDS MultiMC_GENERATE_COVERAGE - COMMENT "Generating test coverage html..." - ) - add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML) -endif(MultiMC_CODE_COVERAGE) - set(MultiMC_TEST_DATA_PATH "${CMAKE_CURRENT_BINARY_DIR}/data") set(MultiMC_TEST_DATA_PATH_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/data") diff --git a/tests/tst_Resource.cpp b/tests/tst_Resource.cpp deleted file mode 100644 index 4bf41a03..00000000 --- a/tests/tst_Resource.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include -#include "TestUtil.h" - -#include "resources/Resource.h" -#include "resources/ResourceHandler.h" -#include "resources/ResourceObserver.h" - -class DummyStringResourceHandler : public ResourceHandler -{ -public: - explicit DummyStringResourceHandler(const QString &key) - : m_key(key) {} - - void init(std::shared_ptr &) override - { - setResult(m_key); - } - - QString m_key; -}; -class DummyObserver : public ResourceObserver -{ -public: - void resourceUpdated() override - { - values += get(); - } - - QStringList values; -}; -class DummyObserverObject : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString property MEMBER property) - -public: - explicit DummyObserverObject(QObject *parent = nullptr) : QObject(parent) {} - - QString property; -}; - -class ResourceTest : public QObject -{ - Q_OBJECT - private - slots: - void initTestCase() - { - Resource::registerHandler("dummy"); - } - void cleanupTestCase() - { - } - - void test_Then() - { - QString val; - Resource::create("dummy:test_Then") - ->then([&val](const QString &key) { val = key; }); - QCOMPARE(val, QStringLiteral("test_Then")); - } - void test_Object() - { - DummyObserver *observer = new DummyObserver; - Resource::create("dummy:test_Object")->applyTo(observer); - QCOMPARE(observer->values, QStringList() << "test_Object"); - } - void test_QObjectProperty() - { - DummyObserverObject *object = new DummyObserverObject; - Resource::create("dummy:test_QObjectProperty")->applyTo(object); - QCOMPARE(object->property, QStringLiteral("test_QObjectProperty")); - } - - void test_DontRequestPlaceholder() - { - // since dummy:asdf immediently gives a value we should not get the placeholder - Resource::create("dummy:asdf", Resource::create("dummy:fdsa")) - ->then([](const QString &key) { QCOMPARE(key, QStringLiteral("asdf")); }); - } - - void test_MergedResources() - { - auto r1 = Resource::create("dummy:asdf"); - auto r2 = Resource::create("dummy:asdf"); - auto r3 = Resource::create("dummy:fdsa"); - auto r4 = Resource::create("dummy:asdf"); - - QCOMPARE(r1, r2); - QCOMPARE(r1, r4); - QVERIFY(r1 != r3); - QVERIFY(r2 != r3); - QVERIFY(r4 != r3); - } - - void test_MergedResourceWithPlaceholder() - { - auto p1 = Resource::create("dummy:placeA"); - auto p2 = Resource::create("dummy:placeB"); - - auto r1 = Resource::create("dummy:asdf"); - auto r2 = Resource::create("dummy:asdf", p1); - auto r3 = Resource::create("dummy:asdf", p2); - auto r4 = Resource::create("dummy:asdf", p1); - - QCOMPARE(r2, r4); - QVERIFY(r1 != r2); - QVERIFY(r1 != r3); - QVERIFY(r1 != r4); - QVERIFY(r2 != r3); - } -}; - -QTEST_GUILESS_MAIN(ResourceTest) - -#include "tst_Resource.moc" -- cgit v1.2.3