Swift
summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/MIXJoinParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/MIXJoinParserFactory.h2
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParser.cpp2
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp2
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp14
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXParticipantParserTest.cpp3
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.cpp6
-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
20 files changed, 48 insertions, 51 deletions
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index 4729fdb..c5304a6 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -136,10 +136,10 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
factories_.push_back(std::make_shared<ChatStateParserFactory>());
factories_.push_back(std::make_shared<ClientStateParserFactory>());
factories_.push_back(std::make_shared<MIXParticipantParserFactory>());
- factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXDestroyParser> >("destroy", "urn:xmpp:mix:1"));
- factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXCreateParser> >("create", "urn:xmpp:mix:1"));
- factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXUserPreferenceParser> >("user-preference", "urn:xmpp:mix:1"));
- factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXLeaveParser> >("leave", "urn:xmpp:mix:1"));
+ factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXDestroyParser> >("destroy", "urn:xmpp:mix:0"));
+ factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXCreateParser> >("create", "urn:xmpp:mix:0"));
+ factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXUserPreferenceParser> >("user-preference", "urn:xmpp:mix:0"));
+ factories_.push_back(std::make_shared<GenericPayloadParserFactory<MIXLeaveParser> >("leave", "urn:xmpp:mix:0"));
factories_.push_back(std::make_shared<MUCUserPayloadParserFactory>(this));
factories_.push_back(std::make_shared<MUCOwnerPayloadParserFactory>(this));
factories_.push_back(std::make_shared<GenericPayloadParserFactory<MUCInvitationPayloadParser> >("x", "jabber:x:conference"));
diff --git a/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp b/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
index 2509667..0c09c44 100644
--- a/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
+++ b/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
@@ -35,7 +35,7 @@ void MIXJoinParser::handleStartElement(const std::string& element, const std::st
}
if (level_ == 1) {
- if (element == "subscribe" && ns == "urn:xmpp:mix:1") {
+ if (element == "subscribe" && ns == "urn:xmpp:mix:0") {
currentPayloadParser_ = std::make_shared<MIXSubscribeParser>();
}
if (element == "x" && ns == "jabber:x:data") {
@@ -57,7 +57,7 @@ void MIXJoinParser::handleEndElement(const std::string& element, const std::stri
}
if (level_ == 1) {
- if (element == "subscribe" && ns == "urn:xmpp:mix:1") {
+ if (element == "subscribe" && ns == "urn:xmpp:mix:0") {
getPayloadInternal()->addSubscription(std::dynamic_pointer_cast<MIXSubscribe>(currentPayloadParser_->getPayload()));
}
if (element == "x" && ns == "jabber:x:data") {
diff --git a/Swiften/Parser/PayloadParsers/MIXJoinParserFactory.h b/Swiften/Parser/PayloadParsers/MIXJoinParserFactory.h
index 6103c70..8432c61 100644
--- a/Swiften/Parser/PayloadParsers/MIXJoinParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/MIXJoinParserFactory.h
@@ -17,7 +17,7 @@ namespace Swift {
}
virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const {
- return element == "join" && ns == "urn:xmpp:mix:1";
+ return element == "join" && ns == "urn:xmpp:mix:0";
}
virtual PayloadParser* createPayloadParser() {
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp
index 85c79c6..f48bbc7 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp
@@ -14,7 +14,7 @@ using namespace Swift;
TEST(MIXCreateParserTest, XEP0369_Example68) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<create xmlns=\"urn:xmpp:mix:1\"/>"
+ "<create xmlns=\"urn:xmpp:mix:0\"/>"
));
auto payload = parser.getPayload<MIXCreate>();
@@ -27,7 +27,7 @@ TEST(MIXCreateParserTest, XEP0369_Example68) {
TEST(MIXCreateParserTest, XEP0369_Example66) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:1\"/>"
+ "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:0\"/>"
));
auto payload = parser.getPayload<MIXCreate>();
@@ -42,10 +42,10 @@ TEST(MIXCreateParserTest, XEP0369_Example66) {
TEST(MIXCreateParserTest, XEP0369_Example67) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:1\">"
+ "<create channel=\"coven\" xmlns=\"urn:xmpp:mix:0\">"
"<x xmlns=\"jabber:x:data\" type=\"result\">"
"<field var=\"FORM_TYPE\" type=\"hidden\">"
- "<value>urn:xmpp:mix:1</value>"
+ "<value>urn:xmpp:mix:0</value>"
"</field>"
"<field var=\"Owner\">"
"<value>hecate@shakespeare.lit</value>"
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParser.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParser.cpp
index fc2588a..80eb144 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParser.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParser.cpp
@@ -14,7 +14,7 @@ using namespace Swift;
TEST(MIXDestroyParserTest, XEP0369_Example70) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:1\"/>"
+ "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:0\"/>"
));
auto payload = parser.getPayload<MIXDestroy>();
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp
index 8e4dff2..5fa321e 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp
@@ -14,7 +14,7 @@ using namespace Swift;
TEST(MIXDestroyParserTest, XEP0369_Example70) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:1\"/>"
+ "<destroy channel=\"coven\" xmlns=\"urn:xmpp:mix:0\"/>"
));
auto payload = parser.getPayload<MIXDestroy>();
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
index 7a422f4..88d8fc1 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
@@ -14,7 +14,7 @@ using namespace Swift;
TEST(MIXJoinParserTest, XEP0369_Example22) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<join xmlns=\"urn:xmpp:mix:1\" channel=\"coven@mix.shakespeare.example\">"
+ "<join xmlns=\"urn:xmpp:mix:0\" channel=\"coven@mix.shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
@@ -41,7 +41,7 @@ TEST(MIXJoinParserTest, XEP0369_Example22) {
TEST(MIXJoinParserTest, XEP0369_Example23) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<join xmlns=\"urn:xmpp:mix:1\">"
+ "<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\"/>"
@@ -67,7 +67,7 @@ TEST(MIXJoinParserTest, XEP0369_Example23) {
TEST(MIXJoinParserTest, XEP0369_Example24) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<join xmlns=\"urn:xmpp:mix:1\" jid=\"123456#coven@mix.shakespeare.example\">"
+ "<join xmlns=\"urn:xmpp:mix:0\" jid=\"123456#coven@mix.shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
@@ -94,12 +94,12 @@ TEST(MIXJoinParserTest, XEP0369_Example24) {
TEST(MIXJoinParserTest, XEP0369_Example29) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<join xmlns=\"urn:xmpp:mix:1\">"
+ "<join xmlns=\"urn:xmpp:mix:0\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<x xmlns=\"jabber:x:data\" type=\"submit\">"
"<field var=\"FORM_TYPE\" type=\"hidden\">"
- "<value>urn:xmpp:mix:1</value>"
+ "<value>urn:xmpp:mix:0</value>"
"</field>"
"<field var=\"JID Visibility\">"
"<value>never</value>"
@@ -130,12 +130,12 @@ TEST(MIXJoinParserTest, XEP0369_Example29) {
TEST(MIXJoinParserTest, XEP0369_Example30) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<join xmlns=\"urn:xmpp:mix:1\" jid=\"hag66@shakespeare.example\">"
+ "<join xmlns=\"urn:xmpp:mix:0\" jid=\"hag66@shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<x xmlns=\"jabber:x:data\" type=\"result\">"
"<field var=\"FORM_TYPE\" type=\"hidden\">"
- "<value>urn:xmpp:mix:1</value>"
+ "<value>urn:xmpp:mix:0</value>"
"</field>"
"<field var=\"JID Visibility\">"
"<value>never</value>"
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp
index dab3ea4..0a2839e 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp
@@ -13,7 +13,7 @@ using namespace Swift;
TEST(MIXLeaveParserTest, XEP0369_Example33) {
PayloadsParserTester parser;
- ASSERT_TRUE(parser.parse("<leave xmlns=\"urn:xmpp:mix:1\" channel=\"coven@mix.shakespeare.example\"/>"));
+ ASSERT_TRUE(parser.parse("<leave xmlns=\"urn:xmpp:mix:0\" channel=\"coven@mix.shakespeare.example\"/>"));
auto payload = parser.getPayload<MIXLeave>();
ASSERT_TRUE(payload);
@@ -24,7 +24,7 @@ TEST(MIXLeaveParserTest, XEP0369_Example33) {
TEST(MIXLeaveParserTest, XEP0369_Example34) {
PayloadsParserTester parser;
- ASSERT_TRUE(parser.parse("<leave xmlns=\"urn:xmpp:mix:1\"/>"));
+ ASSERT_TRUE(parser.parse("<leave xmlns=\"urn:xmpp:mix:0\"/>"));
auto payload = parser.getPayload<MIXLeave>();
ASSERT_TRUE(payload);
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXParticipantParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXParticipantParserTest.cpp
index 27c02e7..57d4b35 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXParticipantParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXParticipantParserTest.cpp
@@ -54,6 +54,3 @@ TEST(MIXParticipantParserTest, XEP0369_Example27_ParticipantEmpty) {
ASSERT_FALSE(payload->getNick());
ASSERT_FALSE(payload->getJID());
}
-
-
-
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.cpp
index 3d048a5..7115f2a 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.cpp
@@ -14,7 +14,7 @@ using namespace Swift;
TEST(MIXUserPreferenceParserTest, XEP0369_Example31) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<user-preference xmlns='urn:xmpp:mix:1'/>"
+ "<user-preference xmlns='urn:xmpp:mix:0'/>"
));
auto payload = parser.getPayload<MIXUserPreference>();
@@ -26,10 +26,10 @@ TEST(MIXUserPreferenceParserTest, XEP0369_Example31) {
TEST(MIXUserPreferenceParserTest, XEP0369_Example32) {
PayloadsParserTester parser;
ASSERT_TRUE(parser.parse(
- "<user-preference xmlns='urn:xmpp:mix:1'>"
+ "<user-preference xmlns='urn:xmpp:mix:0'>"
"<x xmlns='jabber:x:data' type='result'>"
"<field var='FORM_TYPE' type='hidden'>"
- "<value>urn:xmpp:mix:1</value>"
+ "<value>urn:xmpp:mix:0</value>"
"</field>"
"<field var='JID Visibility'>"
"<value>never</value>"
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
@@ -24,7 +24,7 @@ std::string MIXCreateSerializer::serializePayload(std::shared_ptr<MIXCreate> pay
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());
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
@@ -24,7 +24,7 @@ std::string MIXDestroySerializer::serializePayload(std::shared_ptr<MIXDestroy> p
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
@@ -25,7 +25,7 @@ std::string MIXJoinSerializer::serializePayload(std::shared_ptr<MIXJoin> payload
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());
}
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
@@ -22,7 +22,7 @@ std::string MIXLeaveSerializer::serializePayload(std::shared_ptr<MIXLeave> paylo
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());
}
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
@@ -24,7 +24,7 @@ std::string MIXUserPreferenceSerializer::serializePayload(std::shared_ptr<MIXUse
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())));
}
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
@@ -14,7 +14,7 @@ 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));
}
@@ -24,6 +24,6 @@ TEST(MIXCreateSerializerTest, XEP0369_Example66) {
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
@@ -16,6 +16,6 @@ TEST(MIXDestroySerializerTest, XEP0369_Example31) {
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
@@ -29,7 +29,7 @@ TEST(MIXJoinSerializerTest, XEP0369_Example22) {
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\"/>"
@@ -56,7 +56,7 @@ TEST(MIXJoinSerializerTest, XEP0369_Example23) {
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\"/>"
@@ -84,7 +84,7 @@ TEST(MIXJoinSerializerTest, XEP0369_Example24) {
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\"/>"
@@ -110,7 +110,7 @@ TEST(MIXJoinSerializerTest, XEP0369_Example29) {
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>();
@@ -120,12 +120,12 @@ TEST(MIXJoinSerializerTest, XEP0369_Example29) {
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>"
@@ -153,7 +153,7 @@ TEST(MIXJoinSerializerTest, XEP0369_Example30) {
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>();
@@ -173,12 +173,12 @@ TEST(MIXJoinSerializerTest, XEP0369_Example30) {
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>"
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
@@ -16,7 +16,7 @@ TEST(MIXLeaveSerializerTest, XEP0369_Example33) {
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));
}
@@ -25,6 +25,6 @@ TEST(MIXLeaveSerializerTest, XEP0369_Example34) {
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
@@ -15,7 +15,7 @@ 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));
}
@@ -28,7 +28,7 @@ TEST(MIXUserPreferenceSerializerTest, XEP0369_Example32) {
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>();
@@ -48,10 +48,10 @@ TEST(MIXUserPreferenceSerializerTest, XEP0369_Example32) {
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>"