[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [messagelib] messagecomposer/src/composer-ng/autotests: improve autotests (fix some bugs about signa
From:       Montel Laurent <montel () kde ! org>
Date:       2016-08-31 20:36:38
Message-ID: E1bfCFS-00021o-Ai () code ! kde ! org
[Download RAW message or body]

Git commit 406f488a9cef1e33c604e4f78875b7db6fa038d7 by Montel Laurent.
Committed on 31/08/2016 at 20:32.
Pushed by mlaurent into branch 'master'.

improve autotests (fix some bugs about signature)

M  +26   -0    messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp
M  +3    -0    messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h

http://commits.kde.org/messagelib/406f488a9cef1e33c604e4f78875b7db6fa038d7

diff --git a/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp \
b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp index \
                545acf8..39313df 100644
--- a/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp
+++ b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp
@@ -205,7 +205,33 @@ void RichTextComposerNgTest::shouldAddSpecificSignature()
     newSignature.setEnabledSignature(enablesignature);
     newSignature.setInlinedHtml(signaturehtml);
     richtextComposerNg.insertSignature(newSignature, signatureplacement, \
signatureaddtext); +    //qDebug() << " clean html \
"<<richtextComposerNg.toCleanHtml();  QCOMPARE(richtextComposerNg.toPlainText(), \
expected);  }
 
+void RichTextComposerNgTest::shouldReplaceSignature()
+{
+    MessageComposer::RichTextComposerNg richtextComposerNg;
+    richtextComposerNg.createActions(new KActionCollection(this));
+    const QString original(QStringLiteral("foo bla, bli\nbb"));
+    richtextComposerNg.setPlainText(original);
+
+    KIdentityManagement::Signature newSignature(QStringLiteral("Signature"));
+    newSignature.setEnabledSignature(true);
+    newSignature.setInlinedHtml(false);
+    QString expected(QStringLiteral("foo bla, bli\nbb-- \nSignature"));
+    richtextComposerNg.insertSignature(newSignature, \
KIdentityManagement::Signature::End, KIdentityManagement::Signature::AddSeparator); + \
QCOMPARE(richtextComposerNg.toPlainText(), expected); +
+    KIdentityManagement::Signature emptySignature;
+
+    bool replaceSignature = \
richtextComposerNg.composerSignature()->replaceSignature(newSignature, \
emptySignature); +    QVERIFY(replaceSignature);
+    QCOMPARE(richtextComposerNg.toPlainText(), original);
+
+    replaceSignature = \
richtextComposerNg.composerSignature()->replaceSignature(emptySignature, \
newSignature); +    //When signature is empty we can't replace it.
+    QVERIFY(!replaceSignature);
+}
+
 QTEST_MAIN(RichTextComposerNgTest)
diff --git a/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h \
b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h index \
                05af94d..0a47951 100644
--- a/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h
+++ b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h
@@ -46,6 +46,9 @@ private Q_SLOTS:
     void shouldAddSpecificSignature_data();
     void shouldAddSpecificSignature();
 
+
+    void shouldReplaceSignature();
+
 };
 
 #endif // RICHTEXTCOMPOSERNGTEST_H


[prev in list] [next in list] [prev in thread] [next in thread]