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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] libkdepim/addressline: Add more unittest
From:       Montel Laurent <montel () kde ! org>
Date:       2015-02-04 7:13:04
Message-ID: E1YIu92-0007Yw-Il () scm ! kde ! org
[Download RAW message or body]

Git commit e81a004aa484ce06d1e3e87dcf35d3c40f04f602 by Montel Laurent.
Committed on 04/02/2015 at 07:12.
Pushed by mlaurent into branch 'KDE/4.14'.

Add more unittest

M  +35   -0    libkdepim/addressline/autotests/baloocompletionemailtest.cpp
M  +2    -0    libkdepim/addressline/autotests/baloocompletionemailtest.h
M  +2    -2    libkdepim/addressline/baloocompletionemail.cpp

http://commits.kde.org/kdepim/e81a004aa484ce06d1e3e87dcf35d3c40f04f602

diff --git a/libkdepim/addressline/autotests/baloocompletionemailtest.cpp b=
/libkdepim/addressline/autotests/baloocompletionemailtest.cpp
index 96df6fd..e567cdd 100644
--- a/libkdepim/addressline/autotests/baloocompletionemailtest.cpp
+++ b/libkdepim/addressline/autotests/baloocompletionemailtest.cpp
@@ -39,4 +39,39 @@ void BalooCompletionEmailTest::returnEmptyListWhenEmailL=
istIsEmpty()
     QVERIFY(completion.cleanupEmailList().isEmpty());
 }
 =

+void BalooCompletionEmailTest::shouldReturnSameListWhenNotExclude()
+{
+    KPIM::BalooCompletionEmail completion;
+    QStringList emailList;
+    emailList << QLatin1String("foo");
+    emailList << QLatin1String("foo2");
+    emailList << QLatin1String("foo3");
+    emailList << QLatin1String("foo4");
+    emailList << QLatin1String("foo5");
+    emailList << QLatin1String("foo6");
+    completion.setEmailList(emailList);
+    QCOMPARE(completion.cleanupEmailList(), emailList);
+}
+
+void BalooCompletionEmailTest::shouldReturnSameListIfBlackListDoesntInterc=
eptEmail()
+{
+    KPIM::BalooCompletionEmail completion;
+    QStringList emailList;
+    emailList << QLatin1String("foo");
+    emailList << QLatin1String("foo2");
+    emailList << QLatin1String("foo3");
+    emailList << QLatin1String("foo4");
+    emailList << QLatin1String("foo5");
+    emailList << QLatin1String("foo6");
+    completion.setEmailList(emailList);
+
+    QStringList blackList;
+    blackList << QLatin1String("bla");
+    blackList << QLatin1String("bla2");
+    blackList << QLatin1String("bla3");
+    blackList << QLatin1String("bla4");
+    completion.setBlackList(blackList);
+    QCOMPARE(completion.cleanupEmailList(), emailList);
+}
+
 QTEST_KDEMAIN(BalooCompletionEmailTest, NoGUI)
diff --git a/libkdepim/addressline/autotests/baloocompletionemailtest.h b/l=
ibkdepim/addressline/autotests/baloocompletionemailtest.h
index da331d0..a815f3b 100644
--- a/libkdepim/addressline/autotests/baloocompletionemailtest.h
+++ b/libkdepim/addressline/autotests/baloocompletionemailtest.h
@@ -32,6 +32,8 @@ public:
 =

 private Q_SLOTS:
     void returnEmptyListWhenEmailListIsEmpty();
+    void shouldReturnSameListWhenNotExclude();
+    void shouldReturnSameListIfBlackListDoesntInterceptEmail();
 };
 =

 #endif // BALOOCOMPLETIONEMAILTEST_H
diff --git a/libkdepim/addressline/baloocompletionemail.cpp b/libkdepim/add=
ressline/baloocompletionemail.cpp
index faa511a..0ec966c 100644
--- a/libkdepim/addressline/baloocompletionemail.cpp
+++ b/libkdepim/addressline/baloocompletionemail.cpp
@@ -20,7 +20,7 @@
 =

 #include "baloocompletionemail.h"
 =

-#include <QHash>
+#include <QMap>
 using namespace KPIM;
 =

 BalooCompletionEmail::BalooCompletionEmail()
@@ -47,7 +47,7 @@ QStringList BalooCompletionEmail::cleanupEmailList() const
 {
     if (mListEmail.isEmpty())
         return mListEmail;
-    QHash<QString, QString> hashEmail;
+    QMap<QString, QString> hashEmail;
     Q_FOREACH (const QString &email, mListEmail) {
         if (!mBlackList.contains(email)) {
             if (!hashEmail.contains(email.toLower())) {
[prev in list] [next in list] [prev in thread] [next in thread]