Add MIXUpdateSubscription Element, its Parser and Serializer

Updates MIXJoin Element list of subscriptions to an unordered_set. Remove redundant MIXSubscribe Element. License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details. Test-Information: Added tests for MIXUpdateSubscription Parser and Serializer based on examples in XEP 0369, which passes. Tested on Ubuntu 16.04 LTS. Change-Id: Ied06269cf329b4fdffdde4ace67ebffa4089fbde
author: Tarun Gupta <tarun1995gupta@gmail.com> 2017-07-07 21:09:17 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2017-07-18 15:05:09 (GMT)
commit: f0db4d39912e773208e9db2a3da3b68ac92ba17b (patch)
tree: cb6a455ba7b21d2218b3f9f2040af3bf30a39004 /Swiften/Serializer
parent: f21c9448c5187493fd08574962d88c2db1405512 (diff)
download: swift-f0db4d39912e773208e9db2a3da3b68ac92ba17b.zip
swift-f0db4d39912e773208e9db2a3da3b68ac92ba17b.tar.bz2
7 files changed, 118 insertions, 91 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index d1b2e97..428ce76 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -20,60 +20,61 @@
 #include <Swiften/Serializer/PayloadSerializers/CarbonsReceivedSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsSentSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ChatStateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CommandSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DelaySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DeliveryReceiptSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DiscoItemsSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ErrorSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IBBSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IdleSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/LastSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXParticipantSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXRegisterNickSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXSetNickSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCAdminPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/NicknameSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PrioritySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PrivateStorageSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RawXMLPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ResourceBindSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RosterSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h>
@@ -145,56 +146,57 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
     serializers_.push_back(new IdleSerializer());
 
     serializers_.push_back(new StreamInitiationFileInfoSerializer());
     serializers_.push_back(new JingleFileTransferFileInfoSerializer());
     serializers_.push_back(new JingleContentPayloadSerializer());
     serializers_.push_back(new JingleFileTransferDescriptionSerializer());
     serializers_.push_back(new JingleFileTransferHashSerializer());
     serializers_.push_back(new JingleIBBTransportPayloadSerializer());
     serializers_.push_back(new JingleS5BTransportPayloadSerializer());
     serializers_.push_back(new JinglePayloadSerializer(this));
     serializers_.push_back(new S5BProxyRequestSerializer());
     serializers_.push_back(new DeliveryReceiptSerializer());
     serializers_.push_back(new DeliveryReceiptRequestSerializer());
 
     serializers_.push_back(new PubSubSerializer(this));
     serializers_.push_back(new PubSubEventSerializer(this));
     serializers_.push_back(new PubSubOwnerPubSubSerializer(this));
     serializers_.push_back(new PubSubErrorSerializer());
 
     serializers_.push_back(new ResultSetSerializer());
     serializers_.push_back(new ForwardedSerializer(this));
     serializers_.push_back(new MIXParticipantSerializer());
     serializers_.push_back(new MIXCreateSerializer());
     serializers_.push_back(new MIXRegisterNickSerializer());
     serializers_.push_back(new MIXPayloadSerializer());
     serializers_.push_back(new MIXSetNickSerializer());
     serializers_.push_back(new MIXUserPreferenceSerializer());
     serializers_.push_back(new MIXLeaveSerializer());
     serializers_.push_back(new MIXJoinSerializer());
     serializers_.push_back(new MIXDestroySerializer());
+    serializers_.push_back(new MIXUpdateSubscriptionSerializer());
     serializers_.push_back(new MAMResultSerializer(this));
     serializers_.push_back(new MAMQuerySerializer());
     serializers_.push_back(new MAMFinSerializer());
 
     serializers_.push_back(new CarbonsDisableSerializer());
     serializers_.push_back(new CarbonsEnableSerializer());
     serializers_.push_back(new CarbonsPrivateSerializer());
     serializers_.push_back(new CarbonsReceivedSerializer(this));
     serializers_.push_back(new CarbonsSentSerializer(this));
 
     serializers_.push_back(new IsodeIQDelegationSerializer(this));
 
     for (auto serializer : serializers_) {
         addSerializer(serializer);
     }
 }
 
 FullPayloadSerializerCollection::~FullPayloadSerializerCollection() {
     for (auto serializer : serializers_) {
         removeSerializer(serializer);
         delete serializer;
     }
     serializers_.clear();
 }
 
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
index cfb4d31..509e41e 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.cpp
@@ -1,42 +1,49 @@
 /*
  * 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 <string>
 
-#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: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)));
+    auto subscriptionData = payload->getSubscriptions();
+    std::vector<std::string> subscriptions(subscriptionData.begin(), subscriptionData.end());
+    std::sort(subscriptions.begin(), subscriptions.end());
+
+    for (const auto& item : subscriptions) {
+        auto subscribeElement = std::make_shared<XMLElement>("subscribe");
+        subscribeElement->setAttribute("node", item);
+        element.addNode(subscribeElement);
     }
+
     if (payload->getForm()) {
         element.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getForm())));
     }
     return element.serialize();
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.cpp
deleted file mode 100644
index 3ce6d89..0000000
--- a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2017 Tarun Gupta
- * Licensed under the simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include <Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h>
-
-#include <memory>
-
-#include <Swiften/Serializer/XML/XMLElement.h>
-#include <Swiften/Serializer/XML/XMLRawTextNode.h>
-
-using namespace Swift;
-
-MIXSubscribeSerializer::MIXSubscribeSerializer() {
-}
-
-MIXSubscribeSerializer::~MIXSubscribeSerializer() {
-}
-
-std::string MIXSubscribeSerializer::serializePayload(std::shared_ptr<MIXSubscribe> payload) const {
-    if (!payload) {
-        return "";
-    }
-    XMLElement element("subscribe");
-    element.setAttribute("node", payload->getNode());
-    return element.serialize();
-}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.cpp
new file mode 100644
index 0000000..8e95474
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.h>
+
+#include <memory>
+
+#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
+#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+
+namespace Swift {
+
+MIXUpdateSubscriptionSerializer::MIXUpdateSubscriptionSerializer() {
+}
+
+MIXUpdateSubscriptionSerializer::~MIXUpdateSubscriptionSerializer() {
+}
+
+std::string MIXUpdateSubscriptionSerializer::serializePayload(std::shared_ptr<MIXUpdateSubscription> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("update-subscription", "urn:xmpp:mix:0");
+    if (payload->getJID()) {
+        element.setAttribute("jid", *payload->getJID());
+    }
+    auto subscriptionData = payload->getSubscriptions();
+    std::vector<std::string> subscriptions(subscriptionData.begin(), subscriptionData.end());
+    std::sort(subscriptions.begin(), subscriptions.end());
+
+    for (const auto& item : subscriptions) {
+        auto subscribeElement = std::make_shared<XMLElement>("subscribe");
+        subscribeElement->setAttribute("node", item);
+        element.addNode(subscribeElement);
+    }
+    return element.serialize();
+}
+
+}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.h
index a63a2be..ee59bf7 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.h
@@ -1,30 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Elements/MIXSubscribe.h>
+#include <Swiften/Elements/MIXUpdateSubscription.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
-    class SWIFTEN_API MIXSubscribeSerializer : public GenericPayloadSerializer<MIXSubscribe> {
+    class SWIFTEN_API MIXUpdateSubscriptionSerializer : public GenericPayloadSerializer<MIXUpdateSubscription> {
         public:
-            MIXSubscribeSerializer();
-            virtual ~MIXSubscribeSerializer() override;
+            MIXUpdateSubscriptionSerializer();
+            virtual ~MIXUpdateSubscriptionSerializer();
 
-            virtual std::string serializePayload(std::shared_ptr<MIXSubscribe>) const override;
+            virtual std::string serializePayload(std::shared_ptr<MIXUpdateSubscription>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp
index ff8aa70..2987a20 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXJoinSerializerTest.cpp
@@ -1,179 +1,147 @@
 /*
  * 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);
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:presence"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:participants"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:config"));
 
     std::string expectedResult = "<join channel=\"coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>"
                     "<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\"/>"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
                 "</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);
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:presence"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:participants"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:config"));
 
     std::string expectedResult = "<join xmlns=\"urn:xmpp:mix:0\">"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>"
                     "<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\"/>"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
                 "</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);
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:presence"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:participants"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:config"));
 
     std::string expectedResult = "<join jid=\"123456#coven@mix.shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:config\"/>"
                     "<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\"/>"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
                 "</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);
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:presence"));
 
     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: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: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: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);
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+    join->addSubscription(std::string("urn:xmpp:mix:nodes:presence"));
 
     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: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:0\">"
                     "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
                     "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
                     "<x type=\"result\" xmlns=\"jabber:x:data\">"
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUpdateSubscriptionSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUpdateSubscriptionSerializerTest.cpp
new file mode 100644
index 0000000..3e35a82
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUpdateSubscriptionSerializerTest.cpp
@@ -0,0 +1,36 @@
+/*
+ * 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/MIXUpdateSubscriptionSerializer.h>
+
+using namespace Swift;
+
+TEST(MIXUpdateSubscriptionSerializerTest, XEP0369_Example28) {
+    MIXUpdateSubscriptionSerializer testling;
+
+    auto update = std::make_shared<MIXUpdateSubscription>();
+    update->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+
+    std::string expectedResult = "<update-subscription xmlns=\"urn:xmpp:mix:0\">"
+                                    "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+                                "</update-subscription>";
+    ASSERT_EQ(expectedResult, testling.serialize(update));
+}
+
+TEST(MIXUpdateSubscriptionSerializerTest, XEP0369_Example28WithJID) {
+    MIXUpdateSubscriptionSerializer testling;
+
+    auto update = std::make_shared<MIXUpdateSubscription>();
+    update->setJID(JID("hag66@shakespeare.example"));
+    update->addSubscription(std::string("urn:xmpp:mix:nodes:messages"));
+
+    std::string expectedResult = "<update-subscription jid=\"hag66@shakespeare.example\" xmlns=\"urn:xmpp:mix:0\">"
+                                    "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+                                "</update-subscription>";
+    ASSERT_EQ(expectedResult, testling.serialize(update));
+}
author	Tarun Gupta <tarun1995gupta@gmail.com>	2017-07-07 21:09:17 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2017-07-18 15:05:09 (GMT)
commit	f0db4d39912e773208e9db2a3da3b68ac92ba17b (patch)
tree	cb6a455ba7b21d2218b3f9f2040af3bf30a39004 /Swiften/Serializer
parent	f21c9448c5187493fd08574962d88c2db1405512 (diff)
download	swift-f0db4d39912e773208e9db2a3da3b68ac92ba17b.zip swift-f0db4d39912e773208e9db2a3da3b68ac92ba17b.tar.bz2