Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Serializer/PayloadSerializers
diff options
context:
space:
mode:
authorTarun Gupta <tarun1995gupta@gmail.com>2017-06-23 17:52:45 (GMT)
committerTobias Markmann <tm@ayena.de>2017-07-07 11:20:06 (GMT)
commit2a251161c5baa688ec12068346359bd829ab2ea1 (patch)
tree2bb4797ed266305d08a2800fbf728e8149026b84 /Swiften/Serializer/PayloadSerializers
parent610a2169757b578c6246c0d277f95a79695652ba (diff)
downloadswift-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')
-rw-r--r--Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp18
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp8
10 files changed, 23 insertions, 23 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.cpp
index 9476df2..2034d86 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.cpp
@@ -1,38 +1,38 @@
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h>
#include <memory>
#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
#include <Swiften/Serializer/XML/XMLElement.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
using namespace Swift;
MIXCreateSerializer::MIXCreateSerializer() {
}
MIXCreateSerializer::~MIXCreateSerializer() {
}
std::string MIXCreateSerializer::serializePayload(std::shared_ptr<MIXCreate> payload) const {
if (!payload) {
return "";
}
- XMLElement element("create", "urn:xmpp:mix:1");
+ XMLElement element("create", "urn:xmpp:mix:0");
if(payload->getChannel()) {
element.setAttribute("channel", *payload->getChannel());
}
if(payload->getData()) {
element.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getData())));
}
return element.serialize();
}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.cpp
index a395416..ed0d252 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.cpp
@@ -1,30 +1,30 @@
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h>
#include <memory>
#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
#include <Swiften/Serializer/XML/XMLElement.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
using namespace Swift;
MIXDestroySerializer::MIXDestroySerializer() {
}
MIXDestroySerializer::~MIXDestroySerializer() {
}
std::string MIXDestroySerializer::serializePayload(std::shared_ptr<MIXDestroy> payload) const {
if (!payload) {
return "";
}
- XMLElement element("destroy", "urn:xmpp:mix:1");
+ XMLElement element("destroy", "urn:xmpp:mix:0");
element.setAttribute("channel", payload->getChannel());
return element.serialize();
}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
index cae15c2..cfb4d31 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
@@ -1,42 +1,42 @@
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h>
#include <memory>
#include <Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h>
#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
#include <Swiften/Serializer/XML/XMLElement.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
using namespace Swift;
MIXJoinSerializer::MIXJoinSerializer() {
}
MIXJoinSerializer::~MIXJoinSerializer() {
}
std::string MIXJoinSerializer::serializePayload(std::shared_ptr<MIXJoin> payload) const {
if (!payload) {
return "";
}
- XMLElement element("join", "urn:xmpp:mix:1");
+ XMLElement element("join", "urn:xmpp:mix:0");
if (payload->getChannel()) {
element.setAttribute("channel", *payload->getChannel());
}
if (payload->getJID()) {
element.setAttribute("jid", *payload->getJID());
}
for (const auto& item : payload->getSubscriptions()) {
element.addNode(std::make_shared<XMLRawTextNode>(MIXSubscribeSerializer().serialize(item)));
}
if (payload->getForm()) {
element.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getForm())));
}
return element.serialize();
}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.cpp
index 9025e3f..111186a 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.cpp
@@ -1,31 +1,31 @@
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h>
#include <memory>
#include <Swiften/Serializer/XML/XMLElement.h>
namespace Swift {
MIXLeaveSerializer::MIXLeaveSerializer() {
}
MIXLeaveSerializer::~MIXLeaveSerializer() {
}
std::string MIXLeaveSerializer::serializePayload(std::shared_ptr<MIXLeave> payload) const {
if (!payload) {
return "";
}
- XMLElement element("leave", "urn:xmpp:mix:1");
+ XMLElement element("leave", "urn:xmpp:mix:0");
if (payload->getChannel()) {
element.setAttribute("channel", *payload->getChannel());
}
return element.serialize();
}
}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp
index 2d057ad..618e0b3 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp
@@ -1,33 +1,33 @@
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h>
#include <memory>
#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
#include <Swiften/Serializer/XML/XMLElement.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
namespace Swift {
MIXUserPreferenceSerializer::MIXUserPreferenceSerializer() {
}
MIXUserPreferenceSerializer::~MIXUserPreferenceSerializer() {
}
std::string MIXUserPreferenceSerializer::serializePayload(std::shared_ptr<MIXUserPreference> payload) const {
if (!payload) {
return "";
}
- XMLElement element("user-preference", "urn:xmpp:mix:1");
+ XMLElement element("user-preference", "urn:xmpp:mix:0");
if(payload->getData()) {
element.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getData())));
}
return element.serialize();
}
}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp
index 78424be..80210a5 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp
@@ -1,29 +1,29 @@
/*
* 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/MIXCreateSerializer.h>
using namespace Swift;
TEST(MIXCreateSerializerTest, XEP0369_Example31) {
MIXCreateSerializer testling;
auto create = std::make_shared<MIXCreate>();
- std::string expectedResult = "<create xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<create xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(create));
}
TEST(MIXCreateSerializerTest, XEP0369_Example66) {
MIXCreateSerializer testling;
auto create = std::make_shared<MIXCreate>();
create->setChannel(std::string("coven"));
- std::string expectedResult = "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(create));
}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp
index e9cfa8b..5b21873 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp
@@ -1,21 +1,21 @@
/*
* 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/MIXDestroySerializer.h>
using namespace Swift;
TEST(MIXDestroySerializerTest, XEP0369_Example31) {
MIXDestroySerializer testling;
auto destroy = std::make_shared<MIXDestroy>();
destroy->setChannel(std::string("coven"));
- std::string expectedResult = "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(destroy));
}
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));
}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.cpp
index 03e3e76..d9537a8 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.cpp
@@ -1,30 +1,30 @@
/*
* 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/MIXLeaveSerializer.h>
using namespace Swift;
TEST(MIXLeaveSerializerTest, XEP0369_Example33) {
MIXLeaveSerializer testling;
auto leave = std::shared_ptr<MIXLeave>(new MIXLeave());
leave->setChannel(JID("coven@mix.shakespeare.example"));
- std::string expectedResult = "<leave channel=\"coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<leave channel=\"coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(leave));
}
TEST(MIXLeaveSerializerTest, XEP0369_Example34) {
MIXLeaveSerializer testling;
auto leave = std::shared_ptr<MIXLeave>(new MIXLeave());
- std::string expectedResult = "<leave xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<leave xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(leave));
}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp
index 7cbfbfc..0226b0f 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp
@@ -1,68 +1,68 @@
/*
* 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/MIXUserPreferenceSerializer.h>
#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
using namespace Swift;
TEST(MIXUserPreferenceSerializerTest, XEP0369_Example31) {
MIXUserPreferenceSerializer testling;
auto userpreference = std::shared_ptr<MIXUserPreference>(new MIXUserPreference());
- std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:1\"/>";
+ std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:0\"/>";
ASSERT_EQ(expectedResult, testling.serialize(userpreference));
}
TEST(MIXUserPreferenceSerializerTest, XEP0369_Example32) {
MIXUserPreferenceSerializer testling;
auto userpreference = std::shared_ptr<MIXUserPreference>(new MIXUserPreference());
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);
userpreference->setData(parameters);
- std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:1\">"
+ std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:0\">"
"<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>"
"</user-preference>";
ASSERT_EQ(expectedResult, testling.serialize(userpreference));
}