Merge branch 'feature/notifications' into develop

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index e70e34e..4b797c8 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -31,10 +31,12 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
+SINK_DEBUG_AREA("mailsynctest")
+
 void MailSyncTest::initTestCase()
 {
     Test::initTest();
-    Log::setDebugOutputLevel(Sink::Log::Trace);
+    QVERIFY(isBackendAvailable());
     resetTestEnvironment();
     auto resource = createResource();
     QVERIFY(!resource.identifier().isEmpty());
@@ -72,7 +74,7 @@ void MailSyncTest::testListFolders()
                 for (const auto &folder : folders) {
                     names << folder->getName();
                 }
-                Trace() << "base folder: " << names;
+                SinkTrace() << "base folder: " << names;
                 baseCount = folders.size();
             });
         VERIFYEXEC(job);
@@ -196,6 +198,10 @@ void MailSyncTest::testListFolderHierarchy()
             QVERIFY(names.contains("Drafts"));
             names.removeAll("Drafts");
         }
+        if (mCapabilities.contains(ResourceCapabilities::Mail::trash)) {
+            QVERIFY(names.contains("Trash"));
+            names.removeAll("Trash");
+        }
         QCOMPARE(names.size(), 3);
         QCOMPARE(map.value("sub")->getParent(), map.value("test")->identifier());
     });