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

List:       kde-commits
Subject:    [pim-sieve-editor] src/importwizard: Continue to implement import settings
From:       Montel Laurent <null () kde ! org>
Date:       2017-01-31 20:07:34
Message-ID: E1cYeiE-0002a3-RI () code ! kde ! org
[Download RAW message or body]

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/importimapsettingsakonadicheckjobtest.cpp
M  +1    -0    src/importwizard/checks/importimapsettingsakonadicheckjob.cpp

https://commits.kde.org/pim-sieve-editor/0a0ce423bbfe743bb36a0fa56b18975f6736c7d6

diff --git a/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_kolab_resource_0rc \
b/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_kolab_resource_0rc
 index 7aaf3ea..379d455 100644
--- a/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_kolab_resource_0rc
                
+++ b/src/importwizard/autotests/data/config/usecustomsieveconfig/akonadi_kolab_resource_0rc
 @@ -2,3 +2,10 @@
 [network]
 ImapServer=bla.foo.com
 UserName=foo@foo.com
+
+[siever]
+SieveSupport=true
+SieveReuseConfig=false
+SievePort=150
+SieveCustomUsername=b
+
diff --git a/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp \
b/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp index \
                536e143..3684e39 100644
--- a/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp
+++ b/src/importwizard/autotests/importimapsettingsakonadicheckjobtest.cpp
@@ -108,6 +108,17 @@ void \
ImportImapSettingsAkonadiCheckJobTest::shouldImportSieveSettings_data()  \
settings.sieveSettings.port = 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.foo.com"));
+    settings2.sieveImapAccountSettings.setPort(143);
+    settings2.sieveSettings.userName = QStringLiteral("b");
+    settings2.sieveSettings.serverName = QStringLiteral("bla.foo.com"); //TODO
+    settings2.sieveSettings.port = 150;
+
+    QTest::newRow("usecustomsieveconfig") << \
QStringLiteral("/config/usecustomsieveconfig") << \
QStringLiteral("akonadi_kolab_resource_0rc") <<settings2; +
 }
 
 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(const \
QString &directory,  } else {
             const QString sieveCustomUserName = \
sieveGroup.readEntry(QStringLiteral("SieveCustomUsername"));  \
config.sieveSettings.userName = sieveCustomUserName; +            \
config.sieveSettings.serverName = imapServerName; //FIXME  //TODO
         }
         //TODO import kwallet settings too


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