better automated tests log

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · May 2, 2024 · d1dd966 · d1dd966
1 parent 56b1e0d
commit d1dd966
Show file tree

Hide file tree

Showing 59 changed files with 415 additions and 6 deletions.
diff --git a/test/testaccount.cpp b/test/testaccount.cpp
@@ -15,6 +15,7 @@
 #include "accountstate.h"
 #include "configfile.h"
 #include "testhelper.h"
+#include "logger.h"
 
 using namespace OCC;
 
@@ -23,6 +24,14 @@ class TestAccount: public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testAccountDavPath_unitialized_noCrash()
     {
         AccountPtr account = Account::create();

diff --git a/test/testactivitydata.cpp b/test/testactivitydata.cpp
@@ -205,6 +205,11 @@ class TestActivityData : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         account = OCC::Account::create();
         account->setCredentials(new FakeCredentials{fakeQnam.data()});
         account->setUrl(QUrl(("http://example.de")));

diff --git a/test/testactivitylistmodel.cpp b/test/testactivitylistmodel.cpp
@@ -89,6 +89,11 @@ class TestActivityListModel : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         fakeQnam.reset(new FakeQNAM({}));
         account = OCC::Account::create();
         account->setCredentials(new FakeCredentials{fakeQnam.data()});

diff --git a/test/testallfilesdeleted.cpp b/test/testallfilesdeleted.cpp
@@ -32,6 +32,13 @@ class TestAllFilesDeleted : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
 
     void testAllFilesDeletedKeep_data()
     {

diff --git a/test/testasyncop.cpp b/test/testasyncop.cpp
@@ -47,6 +47,13 @@ class TestAsyncOp : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
 
     void asyncUploadOperations()
     {

diff --git a/test/testblacklist.cpp b/test/testblacklist.cpp
@@ -23,6 +23,14 @@ class TestBlacklist : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testBlacklistBasic_data()
     {
         QTest::addColumn<bool>("remote");

diff --git a/test/testcapabilities.cpp b/test/testcapabilities.cpp
@@ -1,12 +1,23 @@
 #include <QTest>
 
 #include "capabilities.h"
+#include "logger.h"
+
+#include <QStandardPaths>
 
 class TestCapabilities : public QObject
 {
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testPushNotificationsAvailable_pushNotificationsForActivitiesAvailable_returnTrue()
     {
         QStringList typeList;

diff --git a/test/testcfapishellextensionsipc.cpp b/test/testcfapishellextensionsipc.cpp
@@ -81,6 +81,11 @@ class TestCfApiShellExtensionsIPC : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         QTemporaryDir dir;
         ConfigFile::setConfDir(dir.path());
 

diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
@@ -15,6 +15,7 @@
 #include "common/checksumconsts.h"
 #include "common/utility.h"
 #include "filesystem.h"
+#include "logger.h"
 #include "propagatorjobs.h"
 
 using namespace OCC;
@@ -72,9 +73,14 @@ using namespace OCC::Utility;
         return sumShell;
     }
 
-    private slots:
+private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
 
-    void initTestCase() {
         _testfile = _root.path()+"/csFile";
         Utility::writeRandomFile( _testfile);
     }

diff --git a/test/testchunkingng.cpp b/test/testchunkingng.cpp
@@ -58,6 +58,14 @@ class TestChunkingNG : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testChunkV2Restrictions()
     {
         FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};

diff --git a/test/testclientsideencryption.cpp b/test/testclientsideencryption.cpp
@@ -12,6 +12,7 @@
 #include <common/constants.h>
 
 #include "clientsideencryption.h"
+#include "logger.h"
 
 using namespace OCC;
 
@@ -25,6 +26,14 @@ class TestClientSideEncryption : public QObject
     }
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void shouldEncryptPrivateKeys()
     {
         // GIVEN

diff --git a/test/testclientsideencryptionv2.cpp b/test/testclientsideencryptionv2.cpp
@@ -32,6 +32,11 @@ class TestClientSideEncryptionV2 : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         QVariantMap fakeCapabilities;
         fakeCapabilities[QStringLiteral("end-to-end-encryption")] = QVariantMap{
             {QStringLiteral("enabled"), true},

diff --git a/test/testclientstatusreporting.cpp b/test/testclientstatusreporting.cpp
@@ -41,6 +41,11 @@ class TestClientStatusReporting : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         OCC::ClientStatusReportingNetwork::clientStatusReportingTrySendTimerInterval = 1000;
         OCC::ClientStatusReportingNetwork::repordSendIntervalMs = 2000;
 

diff --git a/test/testconcaturl.cpp b/test/testconcaturl.cpp
@@ -11,6 +11,7 @@
 #include <QString>
 
 #include "account.h"
+#include "logger.h"
 
 using namespace OCC;
 
@@ -43,6 +44,14 @@ class TestConcatUrl: public QObject
 {
     Q_OBJECT
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testFolder()
     {
         QFETCH(QString, base);

diff --git a/test/testdatabaseerror.cpp b/test/testdatabaseerror.cpp
@@ -17,6 +17,14 @@ class TestDatabaseError : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testDatabaseError() {
         /* This test will make many iteration, at each iteration, the iᵗʰ database access will fail.
          * The test ensure that if there is a failure, the next sync recovers. And if there was

diff --git a/test/testdatefieldbackend.cpp b/test/testdatefieldbackend.cpp
@@ -14,8 +14,11 @@
 
 #include "gui/filedetails/datefieldbackend.h"
 
+#include "logger.h"
+
 #include <QTest>
 #include <QSignalSpy>
+#include <QStandardPaths>
 
 using namespace OCC;
 
@@ -27,6 +30,14 @@ class TestDateFieldBackend : public QObject
     static constexpr auto dateStringFormat = "dd/MM/yyyy";
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testDefaultBehaviour()
     {
         Quick::DateFieldBackend backend;

diff --git a/test/testdownload.cpp b/test/testdownload.cpp
@@ -56,6 +56,13 @@ class TestDownload : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
 
     void testResume()
     {

diff --git a/test/teste2efiletransfer.cpp b/test/teste2efiletransfer.cpp
@@ -19,9 +19,12 @@
 #include "gui/accountstate.h"
 #include "gui/folderman.h"
 #include "common/utility.h"
+#include "logger.h"
 
 #include "endtoendtestutils.h"
 
+#include <QStandardPaths>
+
 class E2eFileTransferTest : public QObject
 {
     Q_OBJECT
@@ -34,6 +37,11 @@ class E2eFileTransferTest : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         qRegisterMetaType<OCC::SyncResult>("OCC::SyncResult");
     }
 

diff --git a/test/teste2eserversetup.cpp b/test/teste2eserversetup.cpp
@@ -17,9 +17,12 @@
 #include <QSignalSpy>
 
 #include "gui/accountstate.h"
+#include "logger.h"
 
 #include "endtoendtestutils.h"
 
+#include <QStandardPaths>
+
 class E2eServerSetupTest : public QObject
 {
     Q_OBJECT
@@ -33,6 +36,11 @@ class E2eServerSetupTest : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         QSignalSpy accountReady(&_helper, &EndToEndTestHelper::accountReady);
         _helper.startAccountConfig();
         QVERIFY(accountReady.wait(3000));

diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
@@ -9,6 +9,7 @@
 #include <QTemporaryDir>
 
 #include "csync_exclude.h"
+#include "logger.h"
 
 using namespace OCC;
 
@@ -64,6 +65,14 @@ static auto check_dir_traversal(const char *path)
 
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testFun()
     {
         ExcludedFiles excluded;

diff --git a/test/testfiletagmodel.cpp b/test/testfiletagmodel.cpp
@@ -50,6 +50,11 @@ class TestFileTagModel : public QObject
 private slots:
     void initTestCase()
     {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+
         _fakeQnam.reset(new FakeQNAM({}));
         _fakeQnam->setOverride([this](QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice * const device) {
             Q_UNUSED(device);

diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
@@ -43,6 +43,14 @@ class TestFolderMan: public QObject
     void incomingShareDeleted();
 
 private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
     void testDeleteEncryptedFiles()
     {
         FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};