Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 0e562d48 authored by Sandro Knauß's avatar Sandro Knauß

update includes

parent 3bc6fa51
......@@ -9,7 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/part)
macro( add_messagecomposer_test _source )
ecm_add_test(${_source}
NAME_PREFIX "messagecomposer-"
LINK_LIBRARIES KF5::Mime KF5::MessageComposer KF5::MessageViewer KF5::MessageCore KF5::TemplateParser
LINK_LIBRARIES KF5::Mime KF5::MessageComposer KF5::MimeTreeParser KF5::MessageCore KF5::TemplateParser
KF5::PimTextEdit Qt5::Test KF5::IdentityManagement KF5::Contacts KF5::AkonadiCore KF5::XmlGui KF5::Libkdepim KF5::IconThemes KF5::Completion
)
endmacro()
......@@ -22,7 +22,7 @@ macro( add_messagecomposer_cryptotest _source )
${_name}
KF5::Mime
KF5::MessageComposer
KF5::MessageViewer
KF5::MimeTreeParser
KF5::MessageCore
KF5::Libkleo
KF5::Libkdepim
......
......@@ -24,13 +24,11 @@
#include "cryptofunctions.h"
#include "testobjecttreesource.h"
#include <QDebug>
#include <qtest.h>
#include "setupenv.h"
#include <Libkleo/Enum>
#include <kmime/kmime_headers.h>
#include <KMime/Headers>
using namespace KMime;
#include <MessageComposer/Composer>
......@@ -39,21 +37,22 @@ using namespace KMime;
#include <MessageComposer/GlobalPart>
#include <MessageComposer/InfoPart>
#include <MessageComposer/TextPart>
#include "MessageComposer/Util"
#include <attachment/attachmentmodel.h>
#include <attachment/attachmentcontrollerbase.h>
#include <MessageComposer/Util>
#include <MessageComposer/AttachmentControllerBase>
#include <MessageComposer/AttachmentModel>
using namespace MessageComposer;
#include <MessageCore/AttachmentPart>
#include <MessageCore/NodeHelper>
#include <setupenv.h>
using namespace MessageCore;
#include <MimeTreeParser/ObjectTreeParser>
using MessageCore::AttachmentPart;
#include <gpgme++/key.h>
#include <QDebug>
#include <QTest>
Q_DECLARE_METATYPE(MessageCore::AttachmentPart)
QTEST_MAIN(CryptoComposerTest)
......
......@@ -21,15 +21,14 @@
#include "cryptofunctions.h"
#include "testobjecttreesource.h"
#include "setupenv.h"
#include "MessageComposer/Util"
#include <MessageComposer/Util>
#include <Libkleo/Enum>
#include <KMime/Message>
#include <KMime/Content>
#include <MessageViewer/CSSHelper>
#include <MessageViewer/ObjectTreeEmptySource>
#include <MimeTreeParser/ObjectTreeParser>
#include <MessageCore/NodeHelper>
......@@ -37,7 +36,6 @@
#include <QtTest>
#include <stdlib.h>
#include <gpgme++/keylistresult.h>
#include <setupenv.h>
using namespace MessageComposer;
......
......@@ -20,15 +20,13 @@
#include "encryptjobtest.h"
#include <QDebug>
#include <qtest.h>
#include "qtest_messagecomposer.h"
#include "cryptofunctions.h"
#include "setupenv.h"
#include <kmime/kmime_content.h>
#include <KMime/Content>
#include <Libkleo/Enum>
#include <kjob.h>
#include <MessageComposer/Composer>
#include <MessageComposer/EncryptJob>
......@@ -37,13 +35,14 @@
#include <MessageComposer/GlobalPart>
#include <MimeTreeParser/ObjectTreeParser>
#include <MessageViewer/ObjectTreeEmptySource>
#include <MimeTreeParser/NodeHelper>
#include <setupenv.h>
#include <stdlib.h>
#include <KCharsets>
#include <QDebug>
#include <QTest>
QTEST_MAIN(EncryptJobTest)
void EncryptJobTest::initTestCase()
......
......@@ -21,37 +21,35 @@
#include "messagefactoryngtest.h"
#include "qtest_messagecomposer.h"
#include "cryptofunctions.h"
#include "setupenv.h"
#include <MessageCore/StringUtil>
#include <MessageCore/NodeHelper>
#include "MessageComposer/Composer"
#include "MessageComposer/MessageFactoryNG"
#include "MessageComposer/GlobalPart"
#include "MessageComposer/MessageComposerSettings"
#include "MessageComposer/Util"
#include <MessageComposer/Composer>
#include <MessageComposer/MessageFactoryNG>
#include <MessageComposer/GlobalPart>
#include <MessageComposer/MessageComposerSettings>
#include <MessageComposer/Util>
#include "MessageComposer/InfoPart"
#include "MessageComposer/TextPart"
#include <MessageComposer/InfoPart>
#include <MessageComposer/TextPart>
#include <setupenv.h>
#include <KMime/DateFormatter>
#include <MimeTreeParser/NodeHelper>
#include <MimeTreeParser/ObjectTreeParser>
#include <KIdentityManagement/KIdentityManagement/IdentityManager>
#include <KIdentityManagement/KIdentityManagement/Identity>
#include "qtest_messagecomposer.h"
#include <kmime/kmime_dateformatter.h>
#include "globalsettings_templateparser.h"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <qtest.h>
#include <QDateTime>
#include <KCharsets>
#include <QDateTime>
#include <QDir>
#include <QLocale>
#include "globalsettings_templateparser.h"
#include <QSignalSpy>
#include <QTest>
using namespace MessageComposer;
......@@ -840,14 +838,6 @@ void MessageFactoryTest::testCreateMDN()
QVERIFY(mdn.data());
//qDebug() << "mdn" << mdn->encodedContent();
/*
// parse the result and make sure it is valid in various ways
TestHtmlWriter testWriter;
TestCSSHelper testCSSHelper;
TestObjectTreeSource testSource( &testWriter, &testCSSHelper );
MimeTreeParser::NodeHelper* nh = new MimeTreeParser::NodeHelper;
MimeTreeParser::ObjectTreeParser otp( &testSource, nh, 0, false, true, 0 );
MimeTreeParser::ProcessResult pResult( nh ); */
QString mdnContent = QString::fromLatin1("The message sent on %1 to %2 with subject \"%3\" has been displayed. "
"This is no guarantee that the message has been read or understood.");
......
......@@ -22,8 +22,6 @@
#ifndef QTEST_MESSAGECOMPOSER_H
#define QTEST_MESSAGECOMPOSER_H
#include <gpgme++/key.h>
/**
* Runs a MessageComposer::JobBase synchronously and aborts if the job failed.
* Similar to QVERIFY( job->exec() ) but includes the job error message
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment