2 files changed, 90 insertions, 2 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp
new file mode 100644
index 0000000..e820083
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp
@@ -0,0 +1,89 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Elements/Storage.h"
+#include "Swiften/Parser/PayloadParsers/PrivateStorageParser.h"
+#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h"
+#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h"
+
+using namespace Swift;
+
+class PrivateStorageParserTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(PrivateStorageParserTest);
+		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST(testParse_NoPayload);
+		CPPUNIT_TEST(testParse_MultiplePayloads);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		PrivateStorageParserTest() {}
+
+		void testParse() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<query xmlns='jabber:iq:private'>"
+					"<storage xmlns='storage:bookmarks'>"
+						"<conference name='Swift' jid='swift@rooms.swift.im'>"
+							"<nick>Alice</nick>"
+						"</conference>"
+					"</storage>"
+				"</query>"));
+
+			boost::shared_ptr<PrivateStorage> payload = boost::dynamic_pointer_cast<PrivateStorage>(parser.getPayload());
+			CPPUNIT_ASSERT(payload);
+			boost::shared_ptr<Storage> storage = boost::dynamic_pointer_cast<Storage>(payload->getPayload());
+			CPPUNIT_ASSERT(storage);
+			CPPUNIT_ASSERT_EQUAL(String("Alice"), storage->getConferences()[0].nick);
+			CPPUNIT_ASSERT_EQUAL(JID("swift@rooms.swift.im"), storage->getConferences()[0].jid);
+		}
+
+		void testParse_NoPayload() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse("<query xmlns='jabber:iq:private'/>"));
+
+			boost::shared_ptr<PrivateStorage> payload = boost::dynamic_pointer_cast<PrivateStorage>(parser.getPayload());
+			CPPUNIT_ASSERT(payload);
+			CPPUNIT_ASSERT(!payload->getPayload());
+		}
+
+		void testParse_MultiplePayloads() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<query xmlns='jabber:iq:private'>"
+					"<storage xmlns='storage:bookmarks'>"
+						"<conference name='Swift' jid='swift@rooms.swift.im'>"
+							"<nick>Alice</nick>"
+						"</conference>"
+					"</storage>"
+					"<storage xmlns='storage:bookmarks'>"
+						"<conference name='Swift' jid='swift@rooms.swift.im'>"
+							"<nick>Rabbit</nick>"
+						"</conference>"
+					"</storage>"
+				"</query>"));
+
+			boost::shared_ptr<PrivateStorage> payload = boost::dynamic_pointer_cast<PrivateStorage>(parser.getPayload());
+			CPPUNIT_ASSERT(payload);
+			boost::shared_ptr<Storage> storage = boost::dynamic_pointer_cast<Storage>(payload->getPayload());
+			CPPUNIT_ASSERT(storage);
+			CPPUNIT_ASSERT_EQUAL(String("Rabbit"), storage->getConferences()[0].nick);
+		}
+
+		void testParse_UnsupportedPayload() {
+			PayloadParserFactoryCollection factories;
+			PrivateStorageParser testling(&factories);
+			PayloadParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<query xmlns='jabber:iq:private'>"
+					"<foo>Bar</foo>"
+				"</query>"));
+
+			CPPUNIT_ASSERT(!boost::dynamic_pointer_cast<PrivateStorage>(testling.getPayload())->getPayload());
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PrivateStorageParserTest);
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/StorageParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/StorageParserTest.cpp
index 0cd0100..3fbf27a 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/StorageParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/StorageParserTest.cpp
@@ -6,8 +6,7 @@
 
 using namespace Swift;
 
-class StorageParserTest : public CppUnit::TestFixture
-{
+class StorageParserTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(StorageParserTest);
 		CPPUNIT_TEST(testParse_Conference);
 		CPPUNIT_TEST(testParse_MultipleConferences);