4 files changed, 27 insertions, 5 deletions

diff --git a/examples/imapresource/tests/imapmailsynctest.cpp b/examples/imapresource/tests/imapmailsynctest.cpp
index 968cde5..fcc659d 100644
--- a/examples/imapresource/tests/imapmailsynctest.cpp
+++ b/examples/imapresource/tests/imapmailsynctest.cpp
@@ -17,6 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 #include <QtTest>
+#include <QTcpSocket>
 
 #include <tests/mailsynctest.h>
 #include "../imapresource.h"
@@ -38,6 +39,13 @@ class ImapMailSyncTest : public Sink::MailSyncTest
     Q_OBJECT
 
 protected:
+    bool isBackendAvailable() Q_DECL_OVERRIDE
+    {
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        return socket.waitForConnected(200);
+    }
+
     void resetTestEnvironment() Q_DECL_OVERRIDE
     {
         system("resetmailbox.sh");
diff --git a/examples/imapresource/tests/imapmailtest.cpp b/examples/imapresource/tests/imapmailtest.cpp
index c94a731..e6f41f4 100644
--- a/examples/imapresource/tests/imapmailtest.cpp
+++ b/examples/imapresource/tests/imapmailtest.cpp
@@ -1,4 +1,5 @@
 #include <QtTest>
+#include <QTcpSocket>
 
 #include <tests/mailtest.h>
 
@@ -18,6 +19,13 @@ class ImapMailTest : public Sink::MailTest
     Q_OBJECT
 
 protected:
+    bool isBackendAvailable() Q_DECL_OVERRIDE
+    {
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        return socket.waitForConnected(200);
+    }
+
     void resetTestEnvironment() Q_DECL_OVERRIDE
     {
         system("resetmailbox.sh");
diff --git a/examples/imapresource/tests/imapserverproxytest.cpp b/examples/imapresource/tests/imapserverproxytest.cpp
index e32298c..ef695b3 100644
--- a/examples/imapresource/tests/imapserverproxytest.cpp
+++ b/examples/imapresource/tests/imapserverproxytest.cpp
@@ -2,6 +2,7 @@
 
 #include <QString>
 #include <KMime/Message>
+#include <QTcpSocket>
 
 #include "../imapserverproxy.h"
 
@@ -11,6 +12,8 @@
 
 using namespace Imap;
 
+SINK_DEBUG_AREA("imapserverproxytest")
+
 /**
  */
 class ImapServerProxyTest : public QObject
@@ -22,7 +25,9 @@ class ImapServerProxyTest : public QObject
 private slots:
     void initTestCase()
     {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        QVERIFY(socket.waitForConnected(200));
         system("resetmailbox.sh");
     }
 
@@ -77,8 +82,8 @@ private slots:
                             const QMap<qint64,KIMAP::MessageAttribute> &attrs,
                             const QMap<qint64,KIMAP::MessageFlags> &flags,
                             const QMap<qint64,KIMAP::MessagePtr> &messages) {
-                        Trace() << "Received " << uids.size() << " messages from " << mailbox;
-                        Trace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
+                        SinkTrace() << "Received " << uids.size() << " messages from " << mailbox;
+                        SinkTrace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
                         count += uids.size();
                     }));
 
@@ -102,8 +107,8 @@ private slots:
                             const QMap<qint64,KIMAP::MessageAttribute> &attrs,
                             const QMap<qint64,KIMAP::MessageFlags> &flags,
                             const QMap<qint64,KIMAP::MessagePtr> &messages) {
-                        Trace() << "Received " << uids.size() << " messages from " << mailbox;
-                        Trace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
+                        SinkTrace() << "Received " << uids.size() << " messages from " << mailbox;
+                        SinkTrace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
                         count += uids.size();
                     }));
 
diff --git a/examples/imapresource/tests/resetmailbox.sh b/examples/imapresource/tests/resetmailbox.sh
index 8834b51..6ed198e 100644
--- a/examples/imapresource/tests/resetmailbox.sh
+++ b/examples/imapresource/tests/resetmailbox.sh
@@ -4,6 +4,7 @@ sudo echo "sam user.doe.* cyrus c" | cyradm --auth PLAIN -u cyrus -w admin local
 sudo echo "dm user.doe.*" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "cm user.doe.test" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "cm user.doe.Drafts" | cyradm --auth PLAIN -u cyrus -w admin localhost
+sudo echo "cm user.doe.Trash" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "sam user.doe cyrus c" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo cp /work/source/Sink/examples/imapresource/tests/data/1365777830.R28.localhost.localdomain\:2\,S /var/spool/imap/d/user/doe/test/1.
 sudo chown cyrus:mail /var/spool/imap/d/user/doe/test/1.