improve SASL test coverage

2 files changed, 20 insertions, 7 deletions

diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 98e9caf7..9373c3d8 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -62,8 +62,8 @@ static QByteArray generateNonce()
 }
 
 QXmppSaslAuth::QXmppSaslAuth(const QString &mechanism, const QByteArray &value)
-    : QXmppSaslStanza("auth", value)
-    , m_mechanism(mechanism)
+    : m_mechanism(mechanism)
+    , m_value(value)
 {
 }
 
@@ -77,10 +77,20 @@ void QXmppSaslAuth::setMechanism(const QString &mechanism)
     m_mechanism = mechanism;
 }
 
+QByteArray QXmppSaslAuth::value() const
+{
+    return m_value;
+}
+
+void QXmppSaslAuth::setValue(const QByteArray &value)
+{
+    m_value = value;
+}
+
 void QXmppSaslAuth::parse(const QDomElement &element)
 {
     m_mechanism = element.attribute("mechanism");
-    setValue(QByteArray::fromBase64(element.text().toAscii()));
+    m_value = QByteArray::fromBase64(element.text().toAscii());
 }
 
 void QXmppSaslAuth::toXml(QXmlStreamWriter *writer) const
@@ -88,8 +98,8 @@ void QXmppSaslAuth::toXml(QXmlStreamWriter *writer) const
     writer->writeStartElement("auth");
     writer->writeAttribute("xmlns", ns_xmpp_sasl);
     writer->writeAttribute("mechanism", m_mechanism);
-    if (!value().isEmpty())
-        writer->writeCharacters(value().toBase64());
+    if (!m_value.isEmpty())
+        writer->writeCharacters(m_value.toBase64());
     writer->writeEndElement();
 }
 
@@ -163,7 +173,6 @@ void QXmppSaslStanza::setValue(const QByteArray &value)
     m_value = value;
 }
 
-
 void QXmppSaslStanza::parse(const QDomElement &element)
 {
     m_type = element.nodeName();
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
index be72152f..f6eeaf71 100644
--- a/src/base/QXmppSasl_p.h
+++ b/src/base/QXmppSasl_p.h
@@ -141,7 +141,7 @@ private:
     QByteArray m_value;
 };
 
-class QXmppSaslAuth : public QXmppSaslStanza
+class QXmppSaslAuth : public QXmppStanza
 {
 public:
     QXmppSaslAuth(const QString &mechanism = QString(), const QByteArray &value = QByteArray());
@@ -149,6 +149,9 @@ public:
     QString mechanism() const;
     void setMechanism(const QString &mechanism);
 
+    QByteArray value() const;
+    void setValue(const QByteArray &value);
+
     /// \cond
     void parse(const QDomElement &element);
     void toXml(QXmlStreamWriter *writer) const;
@@ -156,6 +159,7 @@ public:
 
 private:
     QString m_mechanism;
+    QByteArray m_value;
 };
 
 class QXmppSaslChallenge : public QXmppSaslStanza