From kde-commits  Tue Jan 31 20:07:34 2017
From: Montel Laurent <null () kde ! org>
Date: Tue, 31 Jan 2017 20:07:34 +0000
To: kde-commits
Subject: [pim-sieve-editor] src/importwizard: Continue to implement import settings
Message-Id: <E1cYeiE-0002a3-RI () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148589326427980

Git commit 0a0ce423bbfe743bb36a0fa56b18975f6736c7d6 by Montel Laurent.
Committed on 31/01/2017 at 20:06.
Pushed by mlaurent into branch 'master'.

Continue to implement import settings

M  +7    -0    src/importwizard/autotests/data/config/usecustomsieveconfig/=
akonadi_kolab_resource_0rc
M  +11   -0    src/importwizard/autotests/importimapsettingsakonadicheckjob=
test.cpp
M  +1    -0    src/importwizard/checks/importimapsettingsakonadicheckjob.cpp

https://commits.kde.org/pim-sieve-editor/0a0ce423bbfe743bb36a0fa56b18975f67=
36c7d6

diff --git a/src/importwizard/autotests/data/config/usecustomsieveconfig/ak=
onadi_kolab_resource_0rc b/src/importwizard/autotests/data/config/usecustom=
sieveconfig/akonadi_kolab_resource_0rc
index 7aaf3ea..379d455 100644
--- a/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_k=
olab_resource_0rc
+++ b/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_k=
olab_resource_0rc
@@ -2,3 +2,10 @@
 [network]
 ImapServer=3Dbla.foo.com
 UserName=3Dfoo@foo.com
+
+[siever]
+SieveSupport=3Dtrue
+SieveReuseConfig=3Dfalse
+SievePort=3D150
+SieveCustomUsername=3Db
+
diff --git a/src/importwizard/autotests/importimapsettingsakonadicheckjobte=
st.cpp b/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.c=
pp
index 536e143..3684e39 100644
--- a/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp
+++ b/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp
@@ -108,6 +108,17 @@ void ImportImapSettingsAkonadiCheckJobTest::shouldImpo=
rtSieveSettings_data()
     settings.sieveSettings.port =3D 4190;
 =

     QTest::newRow("reuseconfig") << QStringLiteral("/config/reuseconfig") =
<< QStringLiteral("akonadi_kolab_resource_0rc") <<settings;
+
+    SieveEditorUtil::SieveServerConfig settings2;
+    settings2.sieveImapAccountSettings.setUserName(QStringLiteral("foo@foo=
.com"));
+    settings2.sieveImapAccountSettings.setServerName(QStringLiteral("bla.f=
oo.com"));
+    settings2.sieveImapAccountSettings.setPort(143);
+    settings2.sieveSettings.userName =3D QStringLiteral("b");
+    settings2.sieveSettings.serverName =3D QStringLiteral("bla.foo.com"); =
//TODO
+    settings2.sieveSettings.port =3D 150;
+
+    QTest::newRow("usecustomsieveconfig") << QStringLiteral("/config/usecu=
stomsieveconfig") << QStringLiteral("akonadi_kolab_resource_0rc") <<setting=
s2;
+
 }
 =

 void ImportImapSettingsAkonadiCheckJobTest::shouldImportSieveSettings()
diff --git a/src/importwizard/checks/importimapsettingsakonadicheckjob.cpp =
b/src/importwizard/checks/importimapsettingsakonadicheckjob.cpp
index 41f1934..8d2ce98 100644
--- a/src/importwizard/checks/importimapsettingsakonadicheckjob.cpp
+++ b/src/importwizard/checks/importimapsettingsakonadicheckjob.cpp
@@ -97,6 +97,7 @@ void ImportImapSettingsAkonadiCheckJob::importSettings(co=
nst QString &directory,
         } else {
             const QString sieveCustomUserName =3D sieveGroup.readEntry(QSt=
ringLiteral("SieveCustomUsername"));
             config.sieveSettings.userName =3D sieveCustomUserName;
+            config.sieveSettings.serverName =3D imapServerName; //FIXME
             //TODO
         }
         //TODO import kwallet settings too