summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-02-04 13:56:42 (GMT)
committerSwift Review <review@swift.im>2015-02-09 14:09:18 (GMT)
commitef319397be8439482fdf95f46a29643d15980b37 (patch)
tree01b1b70cedccbbc7f5dde7d72939c3cfeeee1784 /Swiften/Serializer/PayloadSerializers/UnitTest
parent7d3df55bf5fd93b3eaca36cc43cb22ea7879bf7e (diff)
downloadswift-ef319397be8439482fdf95f46a29643d15980b37.zip
swift-ef319397be8439482fdf95f46a29643d15980b37.tar.bz2
Update DiscoInfo string for Jingle file-transfer to :4 and remove obsolete files
Test-Information: Unit tests run successful on OS X 10.9.5 Change-Id: I9df0c798723f79df85cfc7301aed0a7ad6309904
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/UnitTest')
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp
index 8d5bcb7..9d9996d 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp
@@ -26,7 +26,6 @@
#include <Swiften/Elements/JingleS5BTransportPayload.h>
#include <Swiften/Elements/JingleFileTransferHash.h>
#include <Swiften/Elements/JinglePayload.h>
-#include <Swiften/Elements/JingleFileTransferReceived.h>
#include <Swiften/Base/DateTime.h>
#include <Swiften/StringCodecs/Base64.h>
@@ -45,7 +44,6 @@ class JingleSerializersTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testSerialize_Xep0234_Example3);
CPPUNIT_TEST(testSerialize_Xep0234_Example5);
CPPUNIT_TEST(testSerialize_Xep0234_Example8);
- CPPUNIT_TEST(testSerialize_Xep0234_Example13);
CPPUNIT_TEST(testSerialize_Xep0260_Example1);
@@ -336,37 +334,6 @@ class JingleSerializersTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(expected, createTestling()->serialize(payload));
}
- // http://xmpp.org/extensions/xep-0234.html#example-10
- void testSerialize_Xep0234_Example13() {
- std::string expected =
- "<jingle"
- " action=\"session-info\""
- " initiator=\"romeo@montague.lit/orchard\""
- " sid=\"a73sjjvkla37jfea\""
- " xmlns=\"urn:xmpp:jingle:1\">"
- "<received xmlns=\"urn:xmpp:jingle:apps:file-transfer:3\">"
- "<file"
- " hash=\"a749930852c69ae5d2141d3766b1552d\""
- " xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\"/>"
- "</received>"
- "</jingle>";
-
- JinglePayload::ref payload = boost::make_shared<JinglePayload>();
- payload->setAction(JinglePayload::SessionInfo);
- payload->setInitiator(JID("romeo@montague.lit/orchard"));
- payload->setSessionID("a73sjjvkla37jfea");
-
- JingleFileTransferReceived::ref received = boost::make_shared<JingleFileTransferReceived>();
-
- StreamInitiationFileInfo fileInfo;
- fileInfo.setHash("a749930852c69ae5d2141d3766b1552d");
-
- received->setFileInfo(fileInfo);
- payload->addPayload(received);
-
- CPPUNIT_ASSERT_EQUAL(expected, createTestling()->serialize(payload));
- }
-
// http://xmpp.org/extensions/xep-0260.html#example-1
void testSerialize_Xep0260_Example1() {
std::string expected =