Rename UploadRequestManager test to HttpUploadManager test

One of the following commits will add tests also for the
HttpUploadManager.

7 files changed, 22 insertions, 22 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eabfb760..e8427a61 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -98,4 +98,4 @@ endif()
 
 add_subdirectory(qxmpptransfermanager)
 add_subdirectory(qxmpputils)
-add_subdirectory(qxmppuploadrequestmanager)
+add_subdirectory(qxmpphttpuploadmanager)
diff --git a/tests/qxmpphttpuploadmanager/CMakeLists.txt b/tests/qxmpphttpuploadmanager/CMakeLists.txt
new file mode 100644
index 00000000..4425d62d
--- /dev/null
+++ b/tests/qxmpphttpuploadmanager/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2019 Yury Gubich <blue@macaw.me>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+add_executable(tst_qxmpphttpuploadmanager tst_qxmpphttpuploadmanager.cpp tst_qxmpphttpuploadmanager.qrc)
+add_test(tst_qxmpphttpuploadmanager tst_qxmpphttpuploadmanager)
+target_link_libraries(tst_qxmpphttpuploadmanager Qt${QT_VERSION_MAJOR}::Test qxmpp)
diff --git a/tests/qxmppuploadrequestmanager/test.svg b/tests/qxmpphttpuploadmanager/test.svg
index b2838872..b2838872 100644
--- a/tests/qxmppuploadrequestmanager/test.svg
+++ b/tests/qxmpphttpuploadmanager/test.svg
diff --git a/tests/qxmppuploadrequestmanager/test.svg.license b/tests/qxmpphttpuploadmanager/test.svg.license
index 2e519f60..2e519f60 100644
--- a/tests/qxmppuploadrequestmanager/test.svg.license
+++ b/tests/qxmpphttpuploadmanager/test.svg.license
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmpphttpuploadmanager/tst_qxmpphttpuploadmanager.cpp
index 38de7a4c..7f82ac38 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
+++ b/tests/qxmpphttpuploadmanager/tst_qxmpphttpuploadmanager.cpp
@@ -59,7 +59,7 @@ void TestHelper::onSlotReceived(const QXmppHttpUploadSlotIq &)
     error = false;
 }
 
-class tst_QXmppUploadRequestManager : public QObject
+class tst_QXmppHttpUploadManager : public QObject
 {
     Q_OBJECT
 
@@ -92,7 +92,7 @@ private:
     qint64 lastFileSize;
 };
 
-void tst_QXmppUploadRequestManager::onLoggerMessage(QXmppLogger::MessageType type, const QString &text) const
+void tst_QXmppHttpUploadManager::onLoggerMessage(QXmppLogger::MessageType type, const QString &text) const
 {
     QCOMPARE(type, QXmppLogger::SentMessage);
 
@@ -110,7 +110,7 @@ void tst_QXmppUploadRequestManager::onLoggerMessage(QXmppLogger::MessageType typ
     QCOMPARE(iq.contentType(), lastMimeType);
 }
 
-void tst_QXmppUploadRequestManager::initTestCase()
+void tst_QXmppHttpUploadManager::initTestCase()
 {
     uploadServiceName = "upload.montague.tld";
     maxFileSize = 500UL * 1024UL * 1024UL;
@@ -119,7 +119,7 @@ void tst_QXmppUploadRequestManager::initTestCase()
     client.addExtension(manager);
 }
 
-void tst_QXmppUploadRequestManager::testHandleStanza_data()
+void tst_QXmppHttpUploadManager::testHandleStanza_data()
 {
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<bool>("accepted");
@@ -182,7 +182,7 @@ void tst_QXmppUploadRequestManager::testHandleStanza_data()
         << true << true << true;
 }
 
-void tst_QXmppUploadRequestManager::testHandleStanza()
+void tst_QXmppHttpUploadManager::testHandleStanza()
 {
     QFETCH(QByteArray, xml);
     QFETCH(bool, accepted);
@@ -202,7 +202,7 @@ void tst_QXmppUploadRequestManager::testHandleStanza()
     QCOMPARE(realAccepted, accepted);
 }
 
-void tst_QXmppUploadRequestManager::testDiscoveryService_data()
+void tst_QXmppHttpUploadManager::testDiscoveryService_data()
 {
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<bool>("discovered");
@@ -236,7 +236,7 @@ void tst_QXmppUploadRequestManager::testDiscoveryService_data()
         << true;
 }
 
-void tst_QXmppUploadRequestManager::testDiscoveryService()
+void tst_QXmppHttpUploadManager::testDiscoveryService()
 {
     QFETCH(QByteArray, xml);
     QFETCH(bool, discovered);
@@ -255,7 +255,7 @@ void tst_QXmppUploadRequestManager::testDiscoveryService()
     }
 }
 
-void tst_QXmppUploadRequestManager::testSending_data()
+void tst_QXmppHttpUploadManager::testSending_data()
 {
     QTest::addColumn<QFileInfo>("fileInfo");
     QTest::addColumn<QString>("fileName");
@@ -286,7 +286,7 @@ void tst_QXmppUploadRequestManager::testSending_data()
     // Is it something to worry about?
 }
 
-void tst_QXmppUploadRequestManager::testSending()
+void tst_QXmppHttpUploadManager::testSending()
 {
     QFETCH(QFileInfo, fileInfo);
     QFETCH(QString, fileName);
@@ -298,7 +298,7 @@ void tst_QXmppUploadRequestManager::testSending()
     client.setLogger(&logger);
 
     lastMimeType = QMimeDatabase().mimeTypeForName(fileType);
-    connect(&logger, &QXmppLogger::message, this, &tst_QXmppUploadRequestManager::onLoggerMessage);
+    connect(&logger, &QXmppLogger::message, this, &tst_QXmppHttpUploadManager::onLoggerMessage);
 
     lastFileName = fileName;
     lastFileSize = fileSize;
@@ -314,7 +314,7 @@ void tst_QXmppUploadRequestManager::testSending()
     QVERIFY(returnId.isNull());
 }
 
-void tst_QXmppUploadRequestManager::testUploadService()
+void tst_QXmppHttpUploadManager::testUploadService()
 {
     QXmppUploadService service;
     QCOMPARE(service.sizeLimit(), -1LL);
@@ -327,5 +327,5 @@ void tst_QXmppUploadRequestManager::testUploadService()
     QCOMPARE(service.jid(), QStringLiteral("upload.shakespeare.lit"));
 }
 
-QTEST_MAIN(tst_QXmppUploadRequestManager)
-#include "tst_qxmppuploadrequestmanager.moc"
+QTEST_MAIN(tst_QXmppHttpUploadManager)
+#include "tst_qxmpphttpuploadmanager.moc"
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.qrc b/tests/qxmpphttpuploadmanager/tst_qxmpphttpuploadmanager.qrc
index 6b138c92..6b138c92 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.qrc
+++ b/tests/qxmpphttpuploadmanager/tst_qxmpphttpuploadmanager.qrc
diff --git a/tests/qxmppuploadrequestmanager/CMakeLists.txt b/tests/qxmppuploadrequestmanager/CMakeLists.txt
deleted file mode 100644
index 6fcd4a7e..00000000
--- a/tests/qxmppuploadrequestmanager/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Yury Gubich <blue@macaw.me>
-#
-# SPDX-License-Identifier: CC0-1.0
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_executable(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager.cpp tst_qxmppuploadrequestmanager.qrc)
-add_test(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager)
-target_link_libraries(tst_qxmppuploadrequestmanager Qt${QT_VERSION_MAJOR}::Test qxmpp)