From c6407d7a43541e8e7fb38643601cb06a83b8e305 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 4 Jun 2017 15:35:24 +0200 Subject: Removed extraContents Seems largely useless now. The only thing this was planned to be used for is to find the sender of temporary nodes (which are not linked in the mimetree I suppose), but that was apparently not yet implemented. Anyways, I think we can solve this over the parttree. --- .../mimetreeparser/autotests/nodehelpertest.cpp | 182 +-------------------- 1 file changed, 3 insertions(+), 179 deletions(-) (limited to 'framework/src/domain/mime/mimetreeparser/autotests/nodehelpertest.cpp') diff --git a/framework/src/domain/mime/mimetreeparser/autotests/nodehelpertest.cpp b/framework/src/domain/mime/mimetreeparser/autotests/nodehelpertest.cpp index 63e9119e..77f31f19 100644 --- a/framework/src/domain/mime/mimetreeparser/autotests/nodehelpertest.cpp +++ b/framework/src/domain/mime/mimetreeparser/autotests/nodehelpertest.cpp @@ -30,182 +30,6 @@ NodeHelperTest::NodeHelperTest() } -void NodeHelperTest::testPersistentIndex() -{ - NodeHelper helper; - - KMime::Content *node = new KMime::Content(); - KMime::Content *node2 = new KMime::Content(); - KMime::Content *node2Extra = new KMime::Content(); - KMime::Content *subNode = new KMime::Content(); - KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content(); - KMime::Content *node2ExtraSubNode = new KMime::Content(); - KMime::Content *node2ExtraSubsubNode = new KMime::Content(); - KMime::Content *node2ExtraSubsubNode2 = new KMime::Content(); - KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content(); - KMime::Content *subExtra = new KMime::Content(); - KMime::Content *subsubExtra = new KMime::Content(); - KMime::Content *subsubExtraNode = new KMime::Content(); - - subNode->addContent(subsubNode); - subNode->addContent(subsubNode2); - node->addContent(subNode); - subsubExtra->addContent(subsubExtraNode); - helper.attachExtraContent(node, extra); - helper.attachExtraContent(node, extra2); - helper.attachExtraContent(subNode, subExtra); - helper.attachExtraContent(subsubNode2, subsubExtra); - - // This simulates Opaque S/MIME signed and encrypted message with attachment - // (attachment is node2SubsubNode2) - node2Extra->addContent(node2ExtraSubNode); - node2ExtraSubNode->addContent(node2ExtraSubsubNode); - node2ExtraSubNode->addContent(node2ExtraSubsubNode2); - helper.attachExtraContent(node2, node2Extra); - - /* all content has a internal first child, so indexes starts at 2 - * node "" - * -> subNode "2" - * -> subsubNode "2.2" - * -> subsubNode2 "2.3" - * - * node "" - * -> extra "e0" - * -> extra2 "e1" - * - * subNode "2" - * -> subExtra "2:e0" - * - * subsubNode2 "2.3" - * -> subsubExtra "2.3:e0" - * -> subsubExtraNode "2.3:e0:2" - * - * node2 "" - * - * node2 "" - * -> node2Extra "e0" - * -> node2ExtraSubNode "e0:2" - * -> node2ExtraSubsubNode "e0:2.2" - * -> node2ExtraSubsubNode2 "e0:2.3" - */ - - QCOMPARE(helper.persistentIndex(node), QStringLiteral("")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("")), node); - - QCOMPARE(helper.persistentIndex(node->contents()[0]), QStringLiteral("1")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("1")), node->contents()[0]); - - QCOMPARE(helper.persistentIndex(subNode), QStringLiteral("2")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2")), subNode); - - QCOMPARE(helper.persistentIndex(subsubNode), QStringLiteral("2.2")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.2")), subsubNode); - - QCOMPARE(helper.persistentIndex(subsubNode2), QStringLiteral("2.3")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3")), subsubNode2); - - QCOMPARE(helper.persistentIndex(extra), QStringLiteral("e0")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("e0")), extra); - - QCOMPARE(helper.persistentIndex(extra2), QStringLiteral("e1")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("e1")), extra2); - - QCOMPARE(helper.persistentIndex(subExtra), QStringLiteral("2:e0")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2:e0")), subExtra); - - QCOMPARE(helper.persistentIndex(subsubExtra), QStringLiteral("2.3:e0")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3:e0")), subsubExtra); - - QCOMPARE(helper.persistentIndex(subsubExtraNode), QStringLiteral("2.3:e0:2")); - QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3:e0:2")), subsubExtraNode); - - QCOMPARE(helper.persistentIndex(node2ExtraSubsubNode2), QStringLiteral("e0:2.3")); - QCOMPARE(helper.contentFromIndex(node2, QStringLiteral("e0:2.3")), node2ExtraSubsubNode2); - - delete node; -} - -void NodeHelperTest::testHREF() -{ - NodeHelper helper; - KMime::Message::Ptr msg(new KMime::Message); - QUrl url; - - KMime::Content *node = msg->topLevel(); - KMime::Content *subNode = new KMime::Content(); - KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content(); - KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content(); - KMime::Content *subExtra = new KMime::Content(); - KMime::Content *subsubExtra = new KMime::Content(); - KMime::Content *subsubExtraNode = new KMime::Content(); - - subNode->addContent(subsubNode); - subNode->addContent(subsubNode2); - node->addContent(subNode); - subsubExtra->addContent(subsubExtraNode); - helper.attachExtraContent(node, extra); - helper.attachExtraContent(node, extra2); - helper.attachExtraContent(subNode, subExtra); - helper.attachExtraContent(subsubNode2, subsubExtra); - - url = QUrl(QStringLiteral("")); - QCOMPARE(helper.fromHREF(msg, url), node); - - url = QUrl(QStringLiteral("attachment:e0?place=body")); - QCOMPARE(helper.fromHREF(msg, url), extra); - - url = QUrl(QStringLiteral("attachment:2.2?place=body")); - QCOMPARE(helper.fromHREF(msg, url), subsubNode); - - url = QUrl(QStringLiteral("attachment:2.3:e0:2?place=body")); - QCOMPARE(helper.fromHREF(msg, url), subsubExtraNode); - - QCOMPARE(helper.asHREF(node, QStringLiteral("body")), QStringLiteral("attachment:?place=body")); - QCOMPARE(helper.asHREF(extra, QStringLiteral("body")), QStringLiteral("attachment:e0?place=body")); - QCOMPARE(helper.asHREF(subsubNode, QStringLiteral("body")), QStringLiteral("attachment:2.2?place=body")); - QCOMPARE(helper.asHREF(subsubExtraNode, QStringLiteral("body")), QStringLiteral("attachment:2.3:e0:2?place=body")); -} - -void NodeHelperTest::testLocalFiles() -{ - NodeHelper helper; - KMime::Message::Ptr msg(new KMime::Message); - - KMime::Content *node = msg->topLevel(); - KMime::Content *subNode = new KMime::Content(); - KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content(); - KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content(); - KMime::Content *subExtra = new KMime::Content(); - KMime::Content *subsubExtra = new KMime::Content(); - KMime::Content *subsubExtraNode = new KMime::Content(); - - subNode->addContent(subsubNode); - subNode->addContent(subsubNode2); - node->addContent(subNode); - subsubExtra->addContent(subsubExtraNode); - helper.attachExtraContent(node, extra); - helper.attachExtraContent(node, extra2); - helper.attachExtraContent(subNode, subExtra); - helper.attachExtraContent(subsubNode2, subsubExtra); - - // helper.writeNodeToTempFile(node); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(node)), node); - // helper.writeNodeToTempFile(subNode); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subNode)), subNode); - // helper.writeNodeToTempFile(subsubNode); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubNode)), subsubNode); - // helper.writeNodeToTempFile(subsubNode2); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubNode2)), subsubNode2); - // helper.writeNodeToTempFile(extra); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(extra)), extra); - // helper.writeNodeToTempFile(subExtra); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subExtra)), subExtra); - // helper.writeNodeToTempFile(subsubExtra); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubExtra)), subsubExtra); - // helper.writeNodeToTempFile(subsubExtraNode); - // QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubExtraNode)), subsubExtraNode); -} - void NodeHelperTest::testFromAsString() { const QString tlSender = QStringLiteral("Foo "); @@ -241,12 +65,12 @@ void NodeHelperTest::testFromAsString() node->addContent(encMsg); encNode->addContent(encSubNode); - helper.attachExtraContent(subNode, subExtra); - helper.attachExtraContent(encSubNode, encSubExtra); + // helper.attachExtraContent(subNode, subExtra); + // helper.attachExtraContent(encSubNode, encSubExtra); QCOMPARE(helper.fromAsString(node), tlSender); QCOMPARE(helper.fromAsString(subNode), tlSender); - QCOMPARE(helper.fromAsString(subExtra), tlSender); + // QCOMPARE(helper.fromAsString(subExtra), tlSender); QEXPECT_FAIL("", "Returning sender of encapsulated message is not yet implemented", Continue); QCOMPARE(helper.fromAsString(encNode), encSender); QEXPECT_FAIL("", "Returning sender of encapsulated message is not yet implemented", Continue); -- cgit v1.2.3