Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2017-06-23 17:52:45 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-07-07 11:20:06 (GMT) |
| commit | 2a251161c5baa688ec12068346359bd829ab2ea1 (patch) | |
| tree | 2bb4797ed266305d08a2800fbf728e8149026b84 /Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp | |
| parent | 610a2169757b578c6246c0d277f95a79695652ba (diff) | |
| download | swift-2a251161c5baa688ec12068346359bd829ab2ea1.zip swift-2a251161c5baa688ec12068346359bd829ab2ea1.tar.bz2 | |
Update namespace for MIX Elements
Namespace update from urn:xmpp:mix:1 to urn:xmpp:mix:0 for MIX
elements for checking against server implementation
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Change-Id: I1bbd06d83f54fcde81ae0ed06dda90aec0ef1aeb
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp index 61d8a4a..ff8aa70 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp @@ -2,194 +2,194 @@ * Copyright (c) 2017 Tarun Gupta * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ #include <gtest/gtest.h> #include <Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h> using namespace Swift; TEST(MIXJoinSerializerTest, XEP0369_Example22) { MIXJoinSerializer testling; auto join = std::make_shared<MIXJoin>(); join->setChannel(JID("coven@mix.shakespeare.example")); std::shared_ptr<MIXSubscribe> node1(new MIXSubscribe()); node1->setNode(std::string("urn:xmpp:mix:nodes:messages")); join->addSubscription(node1); std::shared_ptr<MIXSubscribe> node2(new MIXSubscribe()); node2->setNode(std::string("urn:xmpp:mix:nodes:presence")); join->addSubscription(node2); std::shared_ptr<MIXSubscribe> node3(new MIXSubscribe()); node3->setNode(std::string("urn:xmpp:mix:nodes:participants")); join->addSubscription(node3); std::shared_ptr<MIXSubscribe> node4(new MIXSubscribe()); node4->setNode(std::string("urn:xmpp:mix:nodes:config")); join->addSubscription(node4); - std::string expectedResult = "<join channel=\"coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:1\">" + std::string expectedResult = "<join channel=\"coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">" "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>" "</join>"; ASSERT_EQ(expectedResult, testling.serialize(join)); } TEST(MIXJoinSerializerTest, XEP0369_Example23) { MIXJoinSerializer testling; std::shared_ptr<MIXJoin> join(new MIXJoin()); std::shared_ptr<MIXSubscribe> node1(new MIXSubscribe()); node1->setNode(std::string("urn:xmpp:mix:nodes:messages")); join->addSubscription(node1); std::shared_ptr<MIXSubscribe> node2(new MIXSubscribe()); node2->setNode(std::string("urn:xmpp:mix:nodes:presence")); join->addSubscription(node2); std::shared_ptr<MIXSubscribe> node3(new MIXSubscribe()); node3->setNode(std::string("urn:xmpp:mix:nodes:participants")); join->addSubscription(node3); std::shared_ptr<MIXSubscribe> node4(new MIXSubscribe()); node4->setNode(std::string("urn:xmpp:mix:nodes:config")); join->addSubscription(node4); - std::string expectedResult = "<join xmlns=\"urn:xmpp:mix:1\">" + std::string expectedResult = "<join xmlns=\"urn:xmpp:mix:0\">" "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>" "</join>"; ASSERT_EQ(expectedResult, testling.serialize(join)); } TEST(MIXJoinSerializerTest, XEP0369_Example24) { MIXJoinSerializer testling; std::shared_ptr<MIXJoin> join(new MIXJoin()); join->setJID(JID("123456#coven@mix.shakespeare.example")); std::shared_ptr<MIXSubscribe> node1(new MIXSubscribe()); node1->setNode(std::string("urn:xmpp:mix:nodes:messages")); join->addSubscription(node1); std::shared_ptr<MIXSubscribe> node2(new MIXSubscribe()); node2->setNode(std::string("urn:xmpp:mix:nodes:presence")); join->addSubscription(node2); std::shared_ptr<MIXSubscribe> node3(new MIXSubscribe()); node3->setNode(std::string("urn:xmpp:mix:nodes:participants")); join->addSubscription(node3); std::shared_ptr<MIXSubscribe> node4(new MIXSubscribe()); node4->setNode(std::string("urn:xmpp:mix:nodes:config")); join->addSubscription(node4); - std::string expectedResult = "<join jid=\"123456#coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:1\">" + std::string expectedResult = "<join jid=\"123456#coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">" "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>" "</join>"; ASSERT_EQ(expectedResult, testling.serialize(join)); } TEST(MIXJoinSerializerTest, XEP0369_Example29) { MIXJoinSerializer testling; std::shared_ptr<MIXJoin> join(new MIXJoin()); std::shared_ptr<MIXSubscribe> node1(new MIXSubscribe()); node1->setNode(std::string("urn:xmpp:mix:nodes:messages")); join->addSubscription(node1); std::shared_ptr<MIXSubscribe> node2(new MIXSubscribe()); node2->setNode(std::string("urn:xmpp:mix:nodes:presence")); join->addSubscription(node2); std::shared_ptr<Form> parameters(std::make_shared<Form>()); parameters->setType(Form::Type::SubmitType); std::shared_ptr<FormField> fieldType = std::make_shared<FormField>(FormField::HiddenType); fieldType->setName("FORM_TYPE"); - fieldType->addValue("urn:xmpp:mix:1"); + fieldType->addValue("urn:xmpp:mix:0"); parameters->addField(fieldType); std::shared_ptr<FormField> fieldJIDVisibility = std::make_shared<FormField>(); fieldJIDVisibility->setName("JID Visibility"); fieldJIDVisibility->addValue("never"); parameters->addField(fieldJIDVisibility); join->setForm(parameters); - std::string expectedResult = "<join xmlns=\"urn:xmpp:mix:1\">" + std::string expectedResult = "<join xmlns=\"urn:xmpp:mix:0\">" "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>" "<x type=\"submit\" xmlns=\"jabber:x:data\">" "<field type=\"hidden\" var=\"FORM_TYPE\">" - "<value>urn:xmpp:mix:1</value>" + "<value>urn:xmpp:mix:0</value>" "</field>" "<field var=\"JID Visibility\">" "<value>never</value>" "</field>" "</x>" "</join>"; ASSERT_EQ(expectedResult, testling.serialize(join)); } TEST(MIXJoinSerializerTest, XEP0369_Example30) { MIXJoinSerializer testling; std::shared_ptr<MIXJoin> join(new MIXJoin()); join->setJID(JID("hag66@shakespeare.example")); std::shared_ptr<MIXSubscribe> node1(new MIXSubscribe()); node1->setNode(std::string("urn:xmpp:mix:nodes:messages")); join->addSubscription(node1); std::shared_ptr<MIXSubscribe> node2(new MIXSubscribe()); node2->setNode(std::string("urn:xmpp:mix:nodes:presence")); join->addSubscription(node2); std::shared_ptr<Form> parameters(std::make_shared<Form>()); parameters->setType(Form::Type::ResultType); std::shared_ptr<FormField> fieldType = std::make_shared<FormField>(FormField::HiddenType); fieldType->setName("FORM_TYPE"); - fieldType->addValue("urn:xmpp:mix:1"); + fieldType->addValue("urn:xmpp:mix:0"); parameters->addField(fieldType); std::shared_ptr<FormField> fieldJIDVisibility = std::make_shared<FormField>(); fieldJIDVisibility->setName("JID Visibility"); fieldJIDVisibility->addValue("never"); parameters->addField(fieldJIDVisibility); std::shared_ptr<FormField> fieldprivateMessages = std::make_shared<FormField>(); fieldprivateMessages->setName("Private Messages"); fieldprivateMessages->addValue("allow"); parameters->addField(fieldprivateMessages); std::shared_ptr<FormField> vCard = std::make_shared<FormField>(); vCard->setName("vCard"); vCard->addValue("block"); parameters->addField(vCard); join->setForm(parameters); - std::string expectedResult = "<join jid=\"hag66@shakespeare.example\" xmlns=\"urn:xmpp:mix:1\">" + std::string expectedResult = "<join jid=\"hag66@shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">" "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>" "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>" "<x type=\"result\" xmlns=\"jabber:x:data\">" "<field type=\"hidden\" var=\"FORM_TYPE\">" - "<value>urn:xmpp:mix:1</value>" + "<value>urn:xmpp:mix:0</value>" "</field>" "<field var=\"JID Visibility\">" "<value>never</value>" "</field>" "<field var=\"Private Messages\">" "<value>allow</value>" "</field>" "<field var=\"vCard\">" "<value>block</value>" "</field>" "</x>" "</join>"; ASSERT_EQ(expectedResult, testling.serialize(join)); } |