From 018eff9c33b7732eb53ce9f8dc4acb3de503677d Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Wed, 15 Oct 2025 17:08:24 +0300 Subject: Remove QMail::messageServerPath() and messageSettingsPath() Not used in the library itself and the implementations don't make too much sense: the paths are using QCoreApplication::applicationDirPath() referring the random client app binary path so there's no much idea where the qmf content really is. There is some use for the server path in an example project, perhaps even proving how little it makes sense as it tries to launch a specific hard-coded binary from the directory. If something, the API should have a method for requesting launching the messageserver. Change-Id: I9b4b245e5c17f2e49fe3b9ed8b30cb175c5e8e45 Reviewed-by: Reviewed-by: Pekka Vuorela Reviewed-by: Damien Caliste --- tests/CMakeLists.txt | 1 - tests/tests.pro | 1 - tests/tests.xml | 11 ----- tests/tst_qmailnamespace/CMakeLists.txt | 12 ----- tests/tst_qmailnamespace/tst_qmailnamespace.cpp | 60 ------------------------- tests/tst_qmailnamespace/tst_qmailnamespace.pro | 8 ---- 6 files changed, 93 deletions(-) delete mode 100644 tests/tst_qmailnamespace/CMakeLists.txt delete mode 100644 tests/tst_qmailnamespace/tst_qmailnamespace.cpp delete mode 100644 tests/tst_qmailnamespace/tst_qmailnamespace.pro (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 081c7cdf..091f82fb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory(tst_qmailmessagebody) add_subdirectory(tst_qmailmessageheader) add_subdirectory(tst_qmailmessagepart) add_subdirectory(tst_qmailmessageset) -add_subdirectory(tst_qmailnamespace) add_subdirectory(tst_qmailserviceaction) add_subdirectory(tst_qmailstorageaction) add_subdirectory(tst_qmailstore) diff --git a/tests/tests.pro b/tests/tests.pro index 4a15f09c..5ae8d571 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -20,7 +20,6 @@ SUBDIRS = \ tst_qmail_listmodels \ tst_storagemanager \ tst_qmaildisconnected \ - tst_qmailnamespace \ tst_locks \ tst_qmailthread \ tst_pop \ diff --git a/tests/tests.xml b/tests/tests.xml index 3a708ed0..77a879f6 100644 --- a/tests/tests.xml +++ b/tests/tests.xml @@ -1075,17 +1075,6 @@ true - - libqmf-tests:tst_qmailnamespace - - libqmf-tests:tst_qmailnamespace:test_qmailnamespace - /usr/tests/qmf/tst_qmailnamespace test_qmailnamespace - - - true - true - - libqmf-tests:tst_qmail_listmodels diff --git a/tests/tst_qmailnamespace/CMakeLists.txt b/tests/tst_qmailnamespace/CMakeLists.txt deleted file mode 100644 index d5da84ae..00000000 --- a/tests/tst_qmailnamespace/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_executable(tst_qmailnamespace tst_qmailnamespace.cpp) -target_include_directories(tst_qmailnamespace - PRIVATE ../../src/libraries/qmfclient ../../src/libraries/qmfclient/support) -target_link_libraries(tst_qmailnamespace - PRIVATE Qt6::Core Qt6::Test QmfClient) - -add_test(NAME tst_qmailnamespace COMMAND tst_qmailnamespace) -set_tests_properties(tst_qmailnamespace PROPERTIES - ENVIRONMENT QT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/src/plugins:$ENV{QT_PLUGIN_PATH}) - -install(TARGETS tst_qmailnamespace - RUNTIME DESTINATION /opt/tests/qmf) diff --git a/tests/tst_qmailnamespace/tst_qmailnamespace.cpp b/tests/tst_qmailnamespace/tst_qmailnamespace.cpp deleted file mode 100644 index a43a12fa..00000000 --- a/tests/tst_qmailnamespace/tst_qmailnamespace.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Messaging Framework. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "qmailnamespace.h" - -using namespace QMail; - -class tst_QMailnamespace : public QObject -{ - Q_OBJECT - -public: - tst_QMailnamespace() {} - virtual ~tst_QMailnamespace() {} - -private slots: - void test_qmailnamespace(); -}; - -void tst_QMailnamespace::test_qmailnamespace() -{ - messageServerPath(); - messageSettingsPath(); -} - -QTEST_MAIN(tst_QMailnamespace) - -#include "tst_qmailnamespace.moc" diff --git a/tests/tst_qmailnamespace/tst_qmailnamespace.pro b/tests/tst_qmailnamespace/tst_qmailnamespace.pro deleted file mode 100644 index 6dbfa288..00000000 --- a/tests/tst_qmailnamespace/tst_qmailnamespace.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = app -CONFIG += qmfclient -TARGET = tst_qmailnamespace - -SOURCES += tst_qmailnamespace.cpp - -include(../tests.pri) - -- cgit v1.2.3