move TestPasswordChecker to test utilities

2 files changed, 33 insertions, 40 deletions

diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp
index c4a78cb2..99ea6235 100644
--- a/tests/qxmppserver/tst_qxmppserver.cpp
+++ b/tests/qxmppserver/tst_qxmppserver.cpp
@@ -22,48 +22,9 @@
  */
 
 #include "QXmppClient.h"
-#include "QXmppPasswordChecker.h"
 #include "QXmppServer.h"
 #include "util.h"
 
-class TestPasswordChecker : public QXmppPasswordChecker
-{
-public:
-    TestPasswordChecker(const QString &username, const QString &password)
-        : m_getPassword(true), m_username(username), m_password(password)
-    {
-    };
-
-    /// Retrieves the password for the given username.
-    QXmppPasswordReply::Error getPassword(const QXmppPasswordRequest &request, QString &password)
-    {
-        if (request.username() == m_username)
-        {
-            password = m_password;
-            return QXmppPasswordReply::NoError;
-        } else {
-            return QXmppPasswordReply::AuthorizationError;
-        }
-    };
-
-    /// Sets whether getPassword() is enabled.
-    void setGetPassword(bool getPassword)
-    {
-        m_getPassword = getPassword;
-    }
-
-    /// Returns whether getPassword() is enabled.
-    bool hasGetPassword() const
-    {
-        return m_getPassword;
-    };
-
-private:
-    bool m_getPassword;
-    QString m_username;
-    QString m_password;
-};
-
 class tst_QXmppServer : public QObject
 {
     Q_OBJECT
@@ -104,7 +65,8 @@ void tst_QXmppServer::testConnect()
     //logger.setLoggingType(QXmppLogger::StdoutLogging);
 
     // prepare server
-    TestPasswordChecker passwordChecker("testuser", "testpwd");
+    TestPasswordChecker passwordChecker;
+    passwordChecker.addCredentials("testuser", "testpwd");
 
     QXmppServer server;
     server.setDomain(testDomain);
diff --git a/tests/util.h b/tests/util.h
index c549d383..bedf5e34 100644
--- a/tests/util.h
+++ b/tests/util.h
@@ -24,6 +24,7 @@
 
 #include <QDomDocument>
 #include <QtTest>
+#include "QXmppPasswordChecker.h"
 
 template <class T>
 static void parsePacket(T &packet, const QByteArray &xml)
@@ -46,3 +47,33 @@ static void serializePacket(T &packet, const QByteArray &xml)
     qDebug() << "writing" << buffer.data();
     QCOMPARE(buffer.data(), xml);
 }
+
+class TestPasswordChecker : public QXmppPasswordChecker
+{
+public:
+    void addCredentials(const QString &user, const QString &password)
+    {
+        m_credentials.insert(user, password);
+    };
+
+    /// Retrieves the password for the given username.
+    QXmppPasswordReply::Error getPassword(const QXmppPasswordRequest &request, QString &password)
+    {
+        if (m_credentials.contains(request.username()))
+        {
+            password = m_credentials.value(request.username());
+            return QXmppPasswordReply::NoError;
+        } else {
+            return QXmppPasswordReply::AuthorizationError;
+        }
+    };
+
+    /// Returns whether getPassword() is enabled.
+    bool hasGetPassword() const
+    {
+        return true;
+    };
+
+private:
+    QMap<QString, QString> m_credentials;
+};