Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-12 17:23:05 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-02-02 11:33:06 (GMT) |
| commit | 1b9ccc1fef6104eaf951153ddccdc6bb15899e9a (patch) | |
| tree | 428232448e9846265605820db6f380a5b98c018a /Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp | |
| parent | 3afd061b713ce5fff604dee62dec8410a1de6a9c (diff) | |
| download | swift-1b9ccc1fef6104eaf951153ddccdc6bb15899e9a.zip swift-1b9ccc1fef6104eaf951153ddccdc6bb15899e9a.tar.bz2 | |
Change stanza body to boost::optional<std::string> type
Changed MUCController to only handle message stanzas as
subject change if <subject/> is present and neither <body/>
nor <thread/> is present in the message stanza.
Test-Information:
Added unit tests verifying behavior described in XEP-0045
section 8.1.
Unit tests pass on OS X 10.11.2.
Change-Id: I1d22272da1675176be131ab360b214a98f20533f
Diffstat (limited to 'Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp index e77e821..fae259f 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp @@ -1,118 +1,118 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> #include <Swiften/Base/DateTime.h> -#include <Swiften/Parser/PayloadParsers/ForwardedParser.h> -#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h> #include <Swiften/Elements/Delay.h> #include <Swiften/Elements/IQ.h> #include <Swiften/Elements/Message.h> #include <Swiften/Elements/Presence.h> +#include <Swiften/Parser/PayloadParsers/ForwardedParser.h> +#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h> using namespace Swift; class ForwardedParserTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(ForwardedParserTest); CPPUNIT_TEST(testParseIQ); CPPUNIT_TEST(testParseMessage); CPPUNIT_TEST(testParseMessageNoDelay); CPPUNIT_TEST(testParsePresence); CPPUNIT_TEST_SUITE_END(); public: void testParseIQ() { PayloadsParserTester parser; CPPUNIT_ASSERT(parser.parse( "<forwarded xmlns=\"urn:xmpp:forward:0\">" "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-07-10T23:08:25Z\"/>" "<iq xmlns=\"jabber:client\" type=\"get\" from=\"kindanormal@example.com/IM\" to=\"stupidnewbie@example.com\" id=\"id0\"/>" "</forwarded>")); boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); boost::shared_ptr<IQ> iq = boost::dynamic_pointer_cast<IQ>(payload->getStanza()); CPPUNIT_ASSERT(!!iq); CPPUNIT_ASSERT_EQUAL(JID("stupidnewbie@example.com"), iq->getTo()); CPPUNIT_ASSERT_EQUAL(JID("kindanormal@example.com/IM"), iq->getFrom()); CPPUNIT_ASSERT_EQUAL(std::string("id0"), iq->getID()); CPPUNIT_ASSERT_EQUAL(IQ::Get, iq->getType()); } void testParseMessage() { PayloadsParserTester parser; CPPUNIT_ASSERT(parser.parse( "<forwarded xmlns=\"urn:xmpp:forward:0\">" "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-07-10T23:08:25Z\"/>" "<message xmlns=\"jabber:client\" to=\"juliet@capulet.lit/balcony\" from=\"romeo@montague.lit/orchard\" type=\"chat\">" "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>" "</message>" "</forwarded>")); boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(payload->getStanza()); CPPUNIT_ASSERT(!!message); const std::string expectedBody = "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."; - CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody()); + CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody().get()); CPPUNIT_ASSERT_EQUAL(Message::Chat, message->getType()); CPPUNIT_ASSERT_EQUAL(JID("juliet@capulet.lit/balcony"), message->getTo()); CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.lit/orchard"), message->getFrom()); } void testParseMessageNoDelay() { PayloadsParserTester parser; CPPUNIT_ASSERT(parser.parse( "<forwarded xmlns=\"urn:xmpp:forward:0\">" "<message xmlns=\"jabber:client\" to=\"juliet@capulet.lit/balcony\" from=\"romeo@montague.lit/orchard\" type=\"chat\">" "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>" "</message>" "</forwarded>")); boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(!payload->getDelay()); boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(payload->getStanza()); CPPUNIT_ASSERT(!!message); const std::string expectedBody = "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."; - CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody()); + CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody().get()); CPPUNIT_ASSERT_EQUAL(Message::Chat, message->getType()); CPPUNIT_ASSERT_EQUAL(JID("juliet@capulet.lit/balcony"), message->getTo()); CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.lit/orchard"), message->getFrom()); } void testParsePresence() { PayloadsParserTester parser; CPPUNIT_ASSERT(parser.parse( "<forwarded xmlns=\"urn:xmpp:forward:0\">" "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-07-10T23:08:25Z\"/>" "<presence xmlns=\"jabber:client\" from=\"alice@wonderland.lit/rabbithole\" to=\"madhatter@wonderland.lit\" type=\"unavailable\"/>" "</forwarded>")); boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); boost::shared_ptr<Presence> presence = boost::dynamic_pointer_cast<Presence>(payload->getStanza()); CPPUNIT_ASSERT(!!presence); CPPUNIT_ASSERT_EQUAL(JID("madhatter@wonderland.lit"), presence->getTo()); CPPUNIT_ASSERT_EQUAL(JID("alice@wonderland.lit/rabbithole"), presence->getFrom()); CPPUNIT_ASSERT_EQUAL(Presence::Unavailable, presence->getType()); } }; CPPUNIT_TEST_SUITE_REGISTRATION(ForwardedParserTest); |