diff --git a/src/ksieveui/autocreatescripts/autotests/CMakeLists.txt b/src/ksieveui/autocreatescripts/autotests/CMakeLists.txt --- a/src/ksieveui/autocreatescripts/autotests/CMakeLists.txt +++ b/src/ksieveui/autocreatescripts/autotests/CMakeLists.txt @@ -20,6 +20,6 @@ add_sieveeditor_autocreatescripts(selectheadertypecomboboxtest.cpp "../sieveconditions/widgets/selectheadertypecombobox.cpp;../autocreatescriptutil.cpp") add_sieveeditor_autocreatescripts(selectheadersdialogtest.cpp "../sieveconditions/widgets/selectheadertypecombobox.cpp;../autocreatescriptutil.cpp") -add_sieveeditor_autocreatescripts(sieveeditorgraphicalmodewidgettest.cpp "${ksieveui_sieveeditor_autocreatescripts_LIB_SRCS}") +add_sieveeditor_autocreatescripts(sieveeditorgraphicalmodewidgettest.cpp "${ksieveui_sieveeditor_autocreatescripts_LIB_SRCS};../../tests/capability.cpp") add_sieveeditor_autocreatescripts(sievedatespinboxtest.cpp "") add_sieveeditor_autocreatescripts(regexpeditorlineedittest.cpp "") diff --git a/src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp b/src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp --- a/src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp +++ b/src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp @@ -20,7 +20,7 @@ #include "sieveeditorgraphicalmodewidgettest.h" #include "../sieveeditorgraphicalmodewidget.h" #include "scriptsparsing/parsingutil.h" -#include +#include "tests/capability.h" #include #include #include @@ -57,8 +57,7 @@ QFETCH(bool, success); KSieveUi::SieveEditorGraphicalModeWidget w; - PimCommon::SieveSyntaxHighlighterUtil sieveHighlighterutil; - const QStringList capabilities = sieveHighlighterutil.fullCapabilities(); + const QStringList capabilities = KSieveUi::Test::fullCapabilitiesList(); w.setSieveCapabilities(capabilities); const QString originalFile = QLatin1String(KSIEVEUI_DATA_DIR) + QLatin1Char('/') + input + QStringLiteral(".siv"); diff --git a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt --- a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt +++ b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt @@ -3,15 +3,15 @@ ) -set(autocreatescripts_gui_SRCS autocreatescripts_gui.cpp) +set(autocreatescripts_gui_SRCS autocreatescripts_gui.cpp ../../tests/capability.cpp) add_executable(autocreatescripts_gui ${autocreatescripts_gui_SRCS}) target_link_libraries(autocreatescripts_gui KF5::KSieveUi KF5::PimCommon KF5::I18n ) -set(parsingscript_gui_SRCS parsingscript_gui.cpp) +set(parsingscript_gui_SRCS parsingscript_gui.cpp ../../tests/capability.cpp) add_executable(parsingscript_gui ${parsingscript_gui_SRCS}) target_link_libraries(parsingscript_gui KF5::KIOCore diff --git a/src/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp b/src/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp --- a/src/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp +++ b/src/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp @@ -21,7 +21,7 @@ #include #include #include "../autocreatescriptdialog.h" -#include +#include "tests/capability.h" int main(int argc, char **argv) { @@ -33,8 +33,7 @@ parser.addHelpOption(); parser.process(app); KSieveUi::AutoCreateScriptDialog *dialog = new KSieveUi::AutoCreateScriptDialog; - PimCommon::SieveSyntaxHighlighterUtil sieveHighlighterutil; - const QStringList capabilities = sieveHighlighterutil.fullCapabilities(); + const QStringList capabilities = KSieveUi::Test::fullCapabilitiesList(); //Add all capabilities for testing dialog->setSieveCapabilities(capabilities); if (dialog->exec()) { diff --git a/src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp b/src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp --- a/src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp +++ b/src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp @@ -34,7 +34,7 @@ #include "../autocreatescriptdialog.h" #include "../sievescriptparsingerrordialog.h" -#include +#include "ksieveui/tests/capability.h" int main(int argc, char **argv) { @@ -78,8 +78,7 @@ dlg.show(); KSieveUi::AutoCreateScriptDialog *dialog = new KSieveUi::AutoCreateScriptDialog; - PimCommon::SieveSyntaxHighlighterUtil sieveHighlighterutil; - const QStringList capabilities = sieveHighlighterutil.fullCapabilities(); + const QStringList capabilities = KSieveUi::Test::fullCapabilitiesList(); //Add all capabilities for testing dialog->setSieveCapabilities(capabilities); QString error; diff --git a/src/ksieveui/editor/tests/CMakeLists.txt b/src/ksieveui/editor/tests/CMakeLists.txt --- a/src/ksieveui/editor/tests/CMakeLists.txt +++ b/src/ksieveui/editor/tests/CMakeLists.txt @@ -3,7 +3,7 @@ ) -set(editorsieve_gui_SRCS editorsieve_gui.cpp) +set(editorsieve_gui_SRCS editorsieve_gui.cpp ../../tests/capability.cpp) add_executable(editorsieve_gui ${editorsieve_gui_SRCS}) target_link_libraries(editorsieve_gui KF5::KSieveUi diff --git a/src/ksieveui/editor/tests/editorsieve_gui.cpp b/src/ksieveui/editor/tests/editorsieve_gui.cpp --- a/src/ksieveui/editor/tests/editorsieve_gui.cpp +++ b/src/ksieveui/editor/tests/editorsieve_gui.cpp @@ -18,7 +18,7 @@ #include "editorsieve_gui.h" #include #include "ksieveui/editor/sieveeditor.h" -#include +#include "ksieveui/tests/capability.h" #include #include @@ -36,8 +36,7 @@ parser.process(app); SieveEditorTestWidget *dialog = new SieveEditorTestWidget; - PimCommon::SieveSyntaxHighlighterUtil sieveHighlighterutil; - const QStringList capabilities = sieveHighlighterutil.fullCapabilities(); + const QStringList capabilities = KSieveUi::Test::fullCapabilitiesList(); //Add all capabilities for testing dialog->setSieveCapabilities(capabilities); if (dialog->exec()) { diff --git a/src/ksieveui/tests/capability.h b/src/ksieveui/tests/capability.h new file mode 100644 --- /dev/null +++ b/src/ksieveui/tests/capability.h @@ -0,0 +1,31 @@ +/* + Copyright (c) 2013-2018 Montel Laurent + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef KSIEVEUITESTSCAPABILITY_H +#define KSIEVEUITESTSCAPABILITY_H + +#include + +namespace KSieveUi { +namespace Test { + +QStringList fullCapabilitiesList(); + +} +} + +#endif //KSIEVEUITESTSCAPABILITY_H diff --git a/src/ksieveui/tests/capability.cpp b/src/ksieveui/tests/capability.cpp new file mode 100644 --- /dev/null +++ b/src/ksieveui/tests/capability.cpp @@ -0,0 +1,60 @@ +/* + Copyright (c) 2013-2018 Montel Laurent + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "capability.h" + +QStringList KSieveUi::Test::fullCapabilitiesList() +{ + return QStringList() + << QStringLiteral("mboxmetadata") + << QStringLiteral("body") + << QStringLiteral("extlists") + << QStringLiteral("envelope") + << QStringLiteral("redirect") + << QStringLiteral("fileinto") + << QStringLiteral("editheader") + << QStringLiteral("reject") + << QStringLiteral("ereject") + << QStringLiteral("imapflags") + << QStringLiteral("imap4flags") + << QStringLiteral("enotify") + << QStringLiteral("date") + << QStringLiteral("copy") + << QStringLiteral("mailbox") + << QStringLiteral("spamtest") + << QStringLiteral("spamtestplus") + << QStringLiteral("virustest") + << QStringLiteral("vacation") + << QStringLiteral("vacation-seconds") + << QStringLiteral("ihave") + << QStringLiteral("subaddress") + << QStringLiteral("environment") + << QStringLiteral("enclose") + << QStringLiteral("replace") + << QStringLiteral("include") + << QStringLiteral("extracttext") + << QStringLiteral("metadata") + << QStringLiteral("convert") + << QStringLiteral("foreverypart") + << QStringLiteral("variables") + << QStringLiteral("servermetadata") + << QStringLiteral("regex") + << QStringLiteral("relational") + << QStringLiteral("comparator-i;ascii-numeric") + << QStringLiteral("comparator-i;unicode-casemap") + << QStringLiteral("encoded-character"); +}