2 files changed, 71 insertions, 26 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
index 88d8fc1..0ad4589 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXJoinParserTest.cpp
@@ -30,12 +30,11 @@ TEST(MIXJoinParserTest, XEP0369_Example22) {
     ASSERT_FALSE(payload->getJID());
     ASSERT_FALSE(payload->getForm());
 
-    const std::vector<MIXSubscribe::ref> items = payload->getSubscriptions();
-    ASSERT_EQ(static_cast<size_t>(4), items.size());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:messages"), items[0]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:presence"), items[1]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:participants"), items[2]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:config"), items[3]->getNode());
+    ASSERT_EQ(static_cast<size_t>(4), payload->getSubscriptions().size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:presence")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:participants")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:config")));
 }
 
 TEST(MIXJoinParserTest, XEP0369_Example23) {
@@ -56,12 +55,11 @@ TEST(MIXJoinParserTest, XEP0369_Example23) {
     ASSERT_FALSE(payload->getJID());
     ASSERT_FALSE(payload->getForm());
 
-    const std::vector<MIXSubscribe::ref> items = payload->getSubscriptions();
-    ASSERT_EQ(static_cast<size_t>(4), items.size());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:messages"), items[0]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:presence"), items[1]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:participants"), items[2]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:config"), items[3]->getNode());
+    ASSERT_EQ(static_cast<size_t>(4), payload->getSubscriptions().size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:presence")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:participants")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:config")));
 }
 
 TEST(MIXJoinParserTest, XEP0369_Example24) {
@@ -83,12 +81,11 @@ TEST(MIXJoinParserTest, XEP0369_Example24) {
     ASSERT_EQ(JID("123456#coven@mix.shakespeare.example"), *payload->getJID());
     ASSERT_FALSE(payload->getForm());
 
-    const std::vector<MIXSubscribe::ref> items = payload->getSubscriptions();
-    ASSERT_EQ(static_cast<size_t>(4), items.size());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:messages"), items[0]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:presence"), items[1]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:participants"), items[2]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:config"), items[3]->getNode());
+    ASSERT_EQ(static_cast<size_t>(4), payload->getSubscriptions().size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:presence")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:participants")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:config")));
 }
 
 TEST(MIXJoinParserTest, XEP0369_Example29) {
@@ -112,10 +109,10 @@ TEST(MIXJoinParserTest, XEP0369_Example29) {
 
     ASSERT_FALSE(payload->getChannel());
     ASSERT_FALSE(payload->getJID());
-    const std::vector<MIXSubscribe::ref> items = payload->getSubscriptions();
-    ASSERT_EQ(static_cast<size_t>(2), items.size());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:messages"), items[0]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:presence"), items[1]->getNode());
+
+    ASSERT_EQ(static_cast<size_t>(2), payload->getSubscriptions().size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:presence")));
 
     ASSERT_TRUE(payload->getForm());
     ASSERT_EQ(Form::Type::SubmitType, payload->getForm()->getType());
@@ -156,10 +153,9 @@ TEST(MIXJoinParserTest, XEP0369_Example30) {
     ASSERT_TRUE(payload->getJID());
     ASSERT_EQ(JID("hag66@shakespeare.example"), *payload->getJID());
 
-    const std::vector<MIXSubscribe::ref> items = payload->getSubscriptions();
-    ASSERT_EQ(static_cast<size_t>(2), items.size());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:messages"), items[0]->getNode());
-    ASSERT_EQ(std::string("urn:xmpp:mix:nodes:presence"), items[1]->getNode());
+    ASSERT_EQ(static_cast<size_t>(2), payload->getSubscriptions().size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:presence")));
 
     ASSERT_TRUE(payload->getForm());
     ASSERT_EQ(Form::Type::ResultType, payload->getForm()->getType());
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MIXUpdateSubscriptionParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MIXUpdateSubscriptionParserTest.cpp
new file mode 100644
index 0000000..985a34b
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MIXUpdateSubscriptionParserTest.cpp
@@ -0,0 +1,49 @@
+/*
+ * 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/Elements/MIXUpdateSubscription.h>
+#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
+
+using namespace Swift;
+
+TEST(MIXUpdateSubscriptionParserTest, XEP0369_Example28) {
+    PayloadsParserTester parser;
+    ASSERT_TRUE(parser.parse(
+                "<update-subscription xmlns=\"urn:xmpp:mix:0\">"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+                "</update-subscription>"
+                ));
+
+    auto payload = parser.getPayload<MIXUpdateSubscription>();
+    ASSERT_TRUE(payload);
+
+    ASSERT_FALSE(payload->getJID());
+
+    auto items = payload->getSubscriptions();
+    ASSERT_EQ(static_cast<size_t>(1), items.size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+}
+
+TEST(MIXUpdateSubscriptionParserTest, XEP0369_Example28_WithJID) {
+    PayloadsParserTester parser;
+    ASSERT_TRUE(parser.parse(
+                "<update-subscription xmlns=\"urn:xmpp:mix:0\" jid=\"hag66@shakespeare.example\">"
+                    "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+                "</update-subscription>"
+                ));
+
+    auto payload = parser.getPayload<MIXUpdateSubscription>();
+    ASSERT_TRUE(payload);
+
+    ASSERT_TRUE(payload->getJID());
+    ASSERT_EQ(JID("hag66@shakespeare.example"), *payload->getJID());
+
+    auto items = payload->getSubscriptions();
+    ASSERT_EQ(static_cast<size_t>(1), items.size());
+    ASSERT_TRUE(payload->hasSubscription(std::string("urn:xmpp:mix:nodes:messages")));
+}