13 files changed, 1238 insertions, 0 deletions
diff --git a/Swiften/Parser/UnitTest/AttributeMapTest.cpp b/Swiften/Parser/UnitTest/AttributeMapTest.cpp
new file mode 100644
index 0000000..17bda95
--- /dev/null
+++ b/Swiften/Parser/UnitTest/AttributeMapTest.cpp
@@ -0,0 +1,71 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/AttributeMap.h"
+
+using namespace Swift;
+
+class AttributeMapTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(AttributeMapTest);
+		CPPUNIT_TEST(testGetBoolAttribute_True);
+		CPPUNIT_TEST(testGetBoolAttribute_1);
+		CPPUNIT_TEST(testGetBoolAttribute_False);
+		CPPUNIT_TEST(testGetBoolAttribute_0);
+		CPPUNIT_TEST(testGetBoolAttribute_Invalid);
+		CPPUNIT_TEST(testGetBoolAttribute_UnknownWithDefaultTrue);
+		CPPUNIT_TEST(testGetBoolAttribute_UnknownWithDefaultFalse);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		AttributeMapTest() {}
+
+		void testGetBoolAttribute_True() {
+			AttributeMap testling;
+			testling["foo"] = "true";
+
+			CPPUNIT_ASSERT(testling.getBoolAttribute("foo"));
+		}
+
+		void testGetBoolAttribute_1() {
+			AttributeMap testling;
+			testling["foo"] = "1";
+
+			CPPUNIT_ASSERT(testling.getBoolAttribute("foo"));
+		}
+
+		void testGetBoolAttribute_False() {
+			AttributeMap testling;
+			testling["foo"] = "false";
+
+			CPPUNIT_ASSERT(!testling.getBoolAttribute("foo", true));
+		}
+
+		void testGetBoolAttribute_0() {
+			AttributeMap testling;
+			testling["foo"] = "0";
+
+			CPPUNIT_ASSERT(!testling.getBoolAttribute("foo", true));
+		}
+
+		void testGetBoolAttribute_Invalid() {
+			AttributeMap testling;
+			testling["foo"] = "bla";
+
+			CPPUNIT_ASSERT(!testling.getBoolAttribute("foo", true));
+		}
+
+		void testGetBoolAttribute_UnknownWithDefaultTrue() {
+			AttributeMap testling;
+
+			CPPUNIT_ASSERT(testling.getBoolAttribute("foo", true));
+		}
+
+		void testGetBoolAttribute_UnknownWithDefaultFalse() {
+			AttributeMap testling;
+
+			CPPUNIT_ASSERT(!testling.getBoolAttribute("foo", false));
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(AttributeMapTest);
diff --git a/Swiften/Parser/UnitTest/ElementParserTester.h b/Swiften/Parser/UnitTest/ElementParserTester.h
new file mode 100644
index 0000000..4d84c44
--- /dev/null
+++ b/Swiften/Parser/UnitTest/ElementParserTester.h
@@ -0,0 +1,10 @@
+#ifndef SWIFTEN_ElementParserTester_H
+#define SWIFTEN_ElementParserTester_H
+
+#include "Swiften/Parser/UnitTest/ParserTester.h"
+
+namespace Swift {
+	typedef ParserTester<ElementParser> ElementParserTester;
+}
+
+#endif
diff --git a/Swiften/Parser/UnitTest/IQParserTest.cpp b/Swiften/Parser/UnitTest/IQParserTest.cpp
new file mode 100644
index 0000000..22b0adc
--- /dev/null
+++ b/Swiften/Parser/UnitTest/IQParserTest.cpp
@@ -0,0 +1,70 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/IQParser.h"
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Parser/UnitTest/StanzaParserTester.h"
+
+using namespace Swift;
+
+class IQParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(IQParserTest);
+		CPPUNIT_TEST(testParse_Set);
+		CPPUNIT_TEST(testParse_Get);
+		CPPUNIT_TEST(testParse_Result);
+		CPPUNIT_TEST(testParse_Error);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		IQParserTest() {}
+
+		void setUp() {
+			factoryCollection_ = new PayloadParserFactoryCollection();
+		}
+
+		void tearDown() {
+			delete factoryCollection_;
+		}
+
+		void testParse_Set() {
+			IQParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<iq type=\"set\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(IQ::Set, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Get() {
+			IQParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<iq type=\"get\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(IQ::Get, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Result() {
+			IQParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<iq type=\"result\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(IQ::Result, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Error() {
+			IQParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<iq type=\"error\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(IQ::Error, testling.getStanzaGeneric()->getType());
+		}
+
+		private:
+			PayloadParserFactoryCollection* factoryCollection_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(IQParserTest);
diff --git a/Swiften/Parser/UnitTest/MessageParserTest.cpp b/Swiften/Parser/UnitTest/MessageParserTest.cpp
new file mode 100644
index 0000000..61a8d20
--- /dev/null
+++ b/Swiften/Parser/UnitTest/MessageParserTest.cpp
@@ -0,0 +1,80 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/MessageParser.h"
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Parser/UnitTest/StanzaParserTester.h"
+
+using namespace Swift;
+
+class MessageParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(MessageParserTest);
+		CPPUNIT_TEST(testParse_Normal);
+		CPPUNIT_TEST(testParse_Chat);
+		CPPUNIT_TEST(testParse_Error);
+		CPPUNIT_TEST(testParse_Groupchat);
+		CPPUNIT_TEST(testParse_Headline);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		MessageParserTest() {}
+
+		void setUp() {
+			factoryCollection_ = new PayloadParserFactoryCollection();
+		}
+
+		void tearDown() {
+			delete factoryCollection_;
+		}
+
+		void testParse_Chat() {
+			MessageParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<message type=\"chat\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Message::Chat, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Groupchat() {
+			MessageParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<message type=\"groupchat\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Message::Groupchat, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Error() {
+			MessageParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<message type=\"error\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Message::Error, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Headline() {
+			MessageParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<message type=\"headline\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Message::Headline, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Normal() {
+			MessageParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<message/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Message::Normal, testling.getStanzaGeneric()->getType());
+		}
+
+		private:
+			PayloadParserFactoryCollection* factoryCollection_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(MessageParserTest);
diff --git a/Swiften/Parser/UnitTest/ParserTester.h b/Swiften/Parser/UnitTest/ParserTester.h
new file mode 100644
index 0000000..7aacc8e
--- /dev/null
+++ b/Swiften/Parser/UnitTest/ParserTester.h
@@ -0,0 +1,44 @@
+#ifndef SWIFTEN_ParserTester_H
+#define SWIFTEN_ParserTester_H
+
+#include "Swiften/Parser/XMLParserClient.h"
+#include "Swiften/Parser/PlatformXMLParserFactory.h"
+#include "Swiften/Parser/XMLParser.h"
+
+namespace Swift {
+	class XMLParser;
+
+	template<typename ParserType>
+	class ParserTester : public XMLParserClient {
+		public:
+			ParserTester(ParserType* parser) : parser_(parser) {
+				xmlParser_ = PlatformXMLParserFactory().createXMLParser(this);
+			}
+
+			~ParserTester() {
+				delete xmlParser_;
+			}
+
+			bool parse(const String& data) {
+				return xmlParser_->parse(data);
+			}
+
+			virtual void handleStartElement(const String& element, const String& ns, const AttributeMap& attributes) {
+				parser_->handleStartElement(element, ns, attributes);
+			}
+
+			virtual void handleEndElement(const String& element, const String& ns) {
+				parser_->handleEndElement(element, ns);
+			}
+
+			virtual void handleCharacterData(const String& data) {
+				parser_->handleCharacterData(data);
+			}
+
+		private:
+			XMLParser* xmlParser_;
+			ParserType* parser_;
+	};
+}
+
+#endif
diff --git a/Swiften/Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp b/Swiften/Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp
new file mode 100644
index 0000000..bfd2c2c
--- /dev/null
+++ b/Swiften/Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp
@@ -0,0 +1,97 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Parser/PayloadParserFactory.h"
+
+using namespace Swift;
+
+class PayloadParserFactoryCollectionTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(PayloadParserFactoryCollectionTest);
+		CPPUNIT_TEST(testGetPayloadParserFactory);
+		CPPUNIT_TEST(testGetPayloadParserFactory_NoMatchingFactory);
+		CPPUNIT_TEST(testGetPayloadParserFactory_TwoMatchingFactories);
+		CPPUNIT_TEST(testGetPayloadParserFactory_MatchWithDefaultFactory);
+		CPPUNIT_TEST(testGetPayloadParserFactory_NoMatchWithDefaultFactory);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		PayloadParserFactoryCollectionTest() {}
+
+		void setUp() {
+		}
+
+		void tearDown() {
+		}
+
+		void testGetPayloadParserFactory() {
+			PayloadParserFactoryCollection testling;
+			DummyFactory factory1("foo");
+			testling.addFactory(&factory1);
+			DummyFactory factory2("bar");
+			testling.addFactory(&factory2);
+			DummyFactory factory3("baz");
+			testling.addFactory(&factory3);
+
+			PayloadParserFactory* factory = testling.getPayloadParserFactory("bar", "", AttributeMap());
+
+			CPPUNIT_ASSERT(factory == &factory2);
+		}
+
+		void testGetPayloadParserFactory_NoMatchingFactory() {
+			PayloadParserFactoryCollection testling;
+			DummyFactory factory("foo");
+
+			CPPUNIT_ASSERT(!testling.getPayloadParserFactory("bar", "", AttributeMap()));
+		}
+
+		void testGetPayloadParserFactory_TwoMatchingFactories() {
+			PayloadParserFactoryCollection testling;
+			DummyFactory factory1("foo");
+			testling.addFactory(&factory1);
+			DummyFactory factory2("foo");
+			testling.addFactory(&factory2);
+
+			PayloadParserFactory* factory = testling.getPayloadParserFactory("foo", "", AttributeMap());
+
+			CPPUNIT_ASSERT(factory == &factory2);
+		}
+
+		void testGetPayloadParserFactory_MatchWithDefaultFactory() {
+			PayloadParserFactoryCollection testling;
+			DummyFactory factory1("foo");
+			testling.addFactory(&factory1);
+			DummyFactory factory2;
+			testling.setDefaultFactory(&factory2);
+
+			PayloadParserFactory* factory = testling.getPayloadParserFactory("foo", "", AttributeMap());
+
+			CPPUNIT_ASSERT(factory == &factory1);
+		}
+
+		void testGetPayloadParserFactory_NoMatchWithDefaultFactory() {
+			PayloadParserFactoryCollection testling;
+			DummyFactory factory1("foo");
+			testling.addFactory(&factory1);
+			DummyFactory factory2;
+			testling.setDefaultFactory(&factory2);
+
+			PayloadParserFactory* factory = testling.getPayloadParserFactory("baz", "", AttributeMap());
+
+			CPPUNIT_ASSERT(factory == &factory2);
+		}
+	
+	
+	private:
+		struct DummyFactory : public PayloadParserFactory {
+			DummyFactory(const String& element = "") : element(element) {}
+			virtual bool canParse(const String& e, const String&, const AttributeMap&) const {
+				return element.isEmpty() ? true : element == e;
+			}
+			virtual PayloadParser* createPayloadParser() { return NULL; }
+			String element;
+		};
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PayloadParserFactoryCollectionTest);
diff --git a/Swiften/Parser/UnitTest/PresenceParserTest.cpp b/Swiften/Parser/UnitTest/PresenceParserTest.cpp
new file mode 100644
index 0000000..5305161
--- /dev/null
+++ b/Swiften/Parser/UnitTest/PresenceParserTest.cpp
@@ -0,0 +1,110 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/PresenceParser.h"
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Parser/UnitTest/StanzaParserTester.h"
+
+using namespace Swift;
+
+class PresenceParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(PresenceParserTest);
+		CPPUNIT_TEST(testParse_Available);
+		CPPUNIT_TEST(testParse_Unavailable);
+		CPPUNIT_TEST(testParse_Subscribe);
+		CPPUNIT_TEST(testParse_Subscribed);
+		CPPUNIT_TEST(testParse_Unsubscribe);
+		CPPUNIT_TEST(testParse_Unsubscribed);
+		CPPUNIT_TEST(testParse_Probe);
+		CPPUNIT_TEST(testParse_Error);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		PresenceParserTest() {}
+
+		void setUp() {
+			factoryCollection_ = new PayloadParserFactoryCollection();
+		}
+
+		void tearDown() {
+			delete factoryCollection_;
+		}
+
+		void testParse_Available() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Available, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Unavailable() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"unavailable\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Unavailable, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Probe() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"probe\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Probe, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Subscribe() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"subscribe\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Subscribe, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Subscribed() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"subscribed\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Subscribed, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Unsubscribe() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"unsubscribe\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Unsubscribe, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Unsubscribed() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"unsubscribed\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Unsubscribed, testling.getStanzaGeneric()->getType());
+		}
+
+		void testParse_Error() {
+			PresenceParser testling(factoryCollection_);
+			StanzaParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse("<presence type=\"error\"/>"));
+
+			CPPUNIT_ASSERT_EQUAL(Presence::Error, testling.getStanzaGeneric()->getType());
+		}
+
+		private:
+			PayloadParserFactoryCollection* factoryCollection_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PresenceParserTest);
diff --git a/Swiften/Parser/UnitTest/SerializingParserTest.cpp b/Swiften/Parser/UnitTest/SerializingParserTest.cpp
new file mode 100644
index 0000000..e08a3d0
--- /dev/null
+++ b/Swiften/Parser/UnitTest/SerializingParserTest.cpp
@@ -0,0 +1,58 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/SerializingParser.h"
+#include "Swiften/Parser/UnitTest/StanzaParserTester.h"
+
+using namespace Swift;
+
+class SerializingParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(SerializingParserTest);
+		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST(testParse_Empty);
+		CPPUNIT_TEST(testParse_ToplevelCharacterData);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		SerializingParserTest() {}
+
+		void testParse() {
+			SerializingParser testling;
+			ParserTester<SerializingParser> parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<message type=\"chat\" to=\"me@foo.com\">"
+					"<body>Hello&lt;&amp;World</body>"
+					"<html xmlns=\"http://www.w3.org/1999/xhtml\">"
+						"foo<b>bar</b>baz"
+					"</html>"
+				"</message>"));
+
+			CPPUNIT_ASSERT_EQUAL(String(
+				"<message to=\"me@foo.com\" type=\"chat\">"
+					"<body>Hello&lt;&amp;World</body>"
+					"<html xmlns=\"http://www.w3.org/1999/xhtml\">foo<b xmlns=\"http://www.w3.org/1999/xhtml\">bar</b>baz</html>"
+				"</message>"), testling.getResult());
+		}
+
+		void testParse_Empty() {
+			SerializingParser testling;
+
+			CPPUNIT_ASSERT_EQUAL(String(""), testling.getResult());
+		}
+
+		void testParse_ToplevelCharacterData() {
+			SerializingParser testling;
+			
+			AttributeMap attributes;
+			testling.handleCharacterData("foo");
+			testling.handleStartElement("message", "", attributes);
+			testling.handleEndElement("message", "");
+			testling.handleCharacterData("bar");
+
+			CPPUNIT_ASSERT_EQUAL(String("<message/>"), testling.getResult());
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SerializingParserTest);
diff --git a/Swiften/Parser/UnitTest/StanzaParserTest.cpp b/Swiften/Parser/UnitTest/StanzaParserTest.cpp
new file mode 100644
index 0000000..3cb1879
--- /dev/null
+++ b/Swiften/Parser/UnitTest/StanzaParserTest.cpp
@@ -0,0 +1,209 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/StanzaParser.h"
+#include "Swiften/Parser/GenericPayloadParser.h"
+#include "Swiften/Parser/PayloadParserFactory.h"
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Elements/Stanza.h"
+#include "Swiften/Elements/Payload.h"
+
+using namespace Swift;
+
+class StanzaParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(StanzaParserTest);
+		CPPUNIT_TEST(testHandleEndElement_OnePayload);
+		CPPUNIT_TEST(testHandleEndElement_MultiplePayloads);
+		CPPUNIT_TEST(testHandleEndElement_StrayCharacterData);
+		CPPUNIT_TEST(testHandleEndElement_UnknownPayload);
+		CPPUNIT_TEST(testHandleParse_BasicAttributes);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		StanzaParserTest() {}
+
+		void setUp() {
+			factoryCollection_ = new PayloadParserFactoryCollection();
+			factoryCollection_->addFactory(&factory1_);
+			factoryCollection_->addFactory(&factory2_);
+		}
+
+		void tearDown() {
+			delete factoryCollection_;
+		}
+
+		void testHandleEndElement_OnePayload() {
+			MyStanzaParser testling(factoryCollection_);
+
+			AttributeMap attributes;
+			attributes["foo"] = "fum";
+			attributes["bar"] = "baz";
+			testling.handleStartElement("mystanza", "", attributes);
+			testling.handleStartElement("mypayload1", "", attributes);
+			testling.handleStartElement("child", "", attributes);
+			testling.handleEndElement("child", "");
+			testling.handleEndElement("mypayload1", "");
+			testling.handleEndElement("mystanza", "");
+
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload1>());
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload1>()->hasChild);
+		}
+
+		void testHandleEndElement_MultiplePayloads() {
+			MyStanzaParser testling(factoryCollection_);
+
+			AttributeMap attributes;
+			testling.handleStartElement("mystanza", "", attributes);
+			testling.handleStartElement("mypayload1", "", attributes);
+			testling.handleEndElement("mypayload1", "");
+			testling.handleStartElement("mypayload2", "", attributes);
+			testling.handleEndElement("mypayload2", "");
+			testling.handleEndElement("mystanza", "");
+
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload1>());
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload2>());
+		}
+
+		void testHandleEndElement_StrayCharacterData() {
+			MyStanzaParser testling(factoryCollection_);
+
+			AttributeMap attributes;
+			testling.handleStartElement("mystanza", "", attributes);
+			testling.handleStartElement("mypayload1", "", attributes);
+			testling.handleEndElement("mypayload1", "");
+			testling.handleCharacterData("bla");
+			testling.handleStartElement("mypayload2", "", attributes);
+			testling.handleEndElement("mypayload2", "");
+			testling.handleEndElement("mystanza", "");
+
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload1>());
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload2>());
+		}
+
+		void testHandleEndElement_UnknownPayload() {
+			MyStanzaParser testling(factoryCollection_);
+
+			AttributeMap attributes;
+			testling.handleStartElement("mystanza", "", attributes);
+			testling.handleStartElement("mypayload1", "", attributes);
+			testling.handleEndElement("mypayload1", "");
+			testling.handleStartElement("unknown-payload", "", attributes);
+			testling.handleStartElement("unknown-payload-child", "", attributes);
+			testling.handleEndElement("unknown-payload-child", "");
+			testling.handleEndElement("unknown-payload", "");
+			testling.handleStartElement("mypayload2", "", attributes);
+			testling.handleEndElement("mypayload2", "");
+			testling.handleEndElement("mystanza", "");
+
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload1>());
+			CPPUNIT_ASSERT(testling.getStanza()->getPayload<MyPayload2>());
+		}
+
+		void testHandleParse_BasicAttributes() {
+			MyStanzaParser testling(factoryCollection_);
+
+			AttributeMap attributes;
+			attributes["to"] = "foo@example.com/blo";
+			attributes["from"] = "bar@example.com/baz";
+			attributes["id"] = "id-123";
+			testling.handleStartElement("mystanza", "", attributes);
+			testling.handleEndElement("mypayload1", "");
+
+			CPPUNIT_ASSERT_EQUAL(JID("foo@example.com/blo"), testling.getStanza()->getTo());
+			CPPUNIT_ASSERT_EQUAL(JID("bar@example.com/baz"), testling.getStanza()->getFrom());
+			CPPUNIT_ASSERT_EQUAL(String("id-123"), testling.getStanza()->getID());
+		}
+
+	private:
+		class MyPayload1 : public Payload
+		{
+			public:
+				MyPayload1() : hasChild(false) {}
+
+				bool hasChild;
+		};
+
+		class MyPayload1Parser : public GenericPayloadParser<MyPayload1>
+		{
+			public:	
+				MyPayload1Parser() {}
+
+			virtual void handleStartElement(const String& element, const String&, const AttributeMap&) { 
+				if (element != "mypayload1") {
+					getPayloadInternal()->hasChild = true;
+				}
+			}
+
+			virtual void handleEndElement(const String&, const String&) {}
+			virtual void handleCharacterData(const String&) {}
+		};
+
+		class MyPayload1ParserFactory : public PayloadParserFactory
+		{
+			public:
+				MyPayload1ParserFactory() {}
+
+				PayloadParser* createPayloadParser() { return new MyPayload1Parser(); }
+
+				bool canParse(const String& element, const String&, const AttributeMap&) const {
+					return element == "mypayload1";
+				}
+		};
+
+		class MyPayload2 : public Payload
+		{
+			public:
+				MyPayload2() {}
+		};
+
+		class MyPayload2Parser : public GenericPayloadParser<MyPayload2>
+		{
+			public:	
+				MyPayload2Parser() {}
+
+			virtual void handleStartElement(const String&, const String&, const AttributeMap&) {}
+			virtual void handleEndElement(const String&, const String&) {}
+			virtual void handleCharacterData(const String&) {}
+		};
+
+
+		class MyPayload2ParserFactory : public PayloadParserFactory
+		{
+			public:
+				MyPayload2ParserFactory() {}
+
+				PayloadParser* createPayloadParser() { return new MyPayload2Parser(); }
+				bool canParse(const String& element, const String&, const AttributeMap&) const {
+					return element == "mypayload2";
+				}
+		};
+
+		class MyStanza : public Stanza
+		{
+			public:
+				MyStanza() {}
+		};
+
+		class MyStanzaParser : public StanzaParser
+		{
+			public:
+				MyStanzaParser(PayloadParserFactoryCollection* collection) : StanzaParser(collection)
+				{
+					stanza_ = boost::shared_ptr<MyStanza>(new MyStanza());
+				}
+			
+				virtual boost::shared_ptr<Element> getElement() const {
+					return stanza_;
+				}
+
+			private:
+				boost::shared_ptr<MyStanza> stanza_;
+		};
+	
+		MyPayload1ParserFactory factory1_;
+		MyPayload2ParserFactory factory2_;
+		PayloadParserFactoryCollection* factoryCollection_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(StanzaParserTest);
diff --git a/Swiften/Parser/UnitTest/StanzaParserTester.h b/Swiften/Parser/UnitTest/StanzaParserTester.h
new file mode 100644
index 0000000..cbd484f
--- /dev/null
+++ b/Swiften/Parser/UnitTest/StanzaParserTester.h
@@ -0,0 +1,11 @@
+#ifndef SWIFTEN_StanzaParserTester_H
+#define SWIFTEN_StanzaParserTester_H
+
+#include "Swiften/Parser/StanzaParser.h"
+#include "Swiften/Parser/UnitTest/ParserTester.h"
+
+namespace Swift {
+	typedef ParserTester<StanzaParser> StanzaParserTester;
+}
+
+#endif
diff --git a/Swiften/Parser/UnitTest/StreamFeaturesParserTest.cpp b/Swiften/Parser/UnitTest/StreamFeaturesParserTest.cpp
new file mode 100644
index 0000000..7fd0512
--- /dev/null
+++ b/Swiften/Parser/UnitTest/StreamFeaturesParserTest.cpp
@@ -0,0 +1,63 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/StreamFeaturesParser.h"
+#include "Swiften/Parser/UnitTest/ElementParserTester.h"
+
+using namespace Swift;
+
+class StreamFeaturesParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(StreamFeaturesParserTest);
+		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST(testParse_Empty);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		StreamFeaturesParserTest() {}
+
+		void testParse() {
+			StreamFeaturesParser testling;
+			ElementParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<stream:features xmlns:stream='http://etherx.jabber.org/streams'>"
+					"<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>"
+					"<compression xmlns=\"http://jabber.org/features/compress\">"
+						"<method>zlib</method>"
+						"<method>lzw</method>"
+					"</compression>"
+					"<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
+						"<mechanism>DIGEST-MD5</mechanism>"
+						"<mechanism>PLAIN</mechanism>"
+					"</mechanisms>"
+					"<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>"
+					"<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>"
+				"</stream:features>"));
+
+			StreamFeatures* element = dynamic_cast<StreamFeatures*>(testling.getElement().get());
+			CPPUNIT_ASSERT(element->hasStartTLS());
+			CPPUNIT_ASSERT(element->hasSession());
+			CPPUNIT_ASSERT(element->hasResourceBind());
+			CPPUNIT_ASSERT(element->hasCompressionMethod("zlib"));
+			CPPUNIT_ASSERT(element->hasCompressionMethod("lzw"));
+			CPPUNIT_ASSERT(element->hasAuthenticationMechanisms());
+			CPPUNIT_ASSERT(element->hasAuthenticationMechanism("DIGEST-MD5"));
+			CPPUNIT_ASSERT(element->hasAuthenticationMechanism("PLAIN"));
+		}
+
+		void testParse_Empty() {
+			StreamFeaturesParser testling;
+			ElementParserTester parser(&testling);
+
+			parser.parse("<stream:features xmlns:stream='http://etherx.jabber.org/streams'/>");
+
+			StreamFeatures* element = dynamic_cast<StreamFeatures*>(testling.getElement().get());
+			CPPUNIT_ASSERT(!element->hasStartTLS());
+			CPPUNIT_ASSERT(!element->hasSession());
+			CPPUNIT_ASSERT(!element->hasResourceBind());
+			CPPUNIT_ASSERT(!element->hasAuthenticationMechanisms());
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(StreamFeaturesParserTest);
diff --git a/Swiften/Parser/UnitTest/XMLParserTest.cpp b/Swiften/Parser/UnitTest/XMLParserTest.cpp
new file mode 100644
index 0000000..6ef1899
--- /dev/null
+++ b/Swiften/Parser/UnitTest/XMLParserTest.cpp
@@ -0,0 +1,229 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <vector>
+
+#include "Swiften/Base/String.h"
+#include "Swiften/Parser/XMLParserClient.h"
+#ifdef HAVE_EXPAT
+#include "Swiften/Parser/ExpatParser.h"
+#endif
+#ifdef HAVE_LIBXML
+#include "Swiften/Parser/LibXMLParser.h"
+#endif
+
+using namespace Swift;
+
+template <typename ParserType>
+class XMLParserTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(XMLParserTest);
+		CPPUNIT_TEST(testParse_NestedElements);
+		CPPUNIT_TEST(testParse_ElementInNamespacedElement);
+		CPPUNIT_TEST(testParse_CharacterData);
+		CPPUNIT_TEST(testParse_NamespacePrefix);
+		CPPUNIT_TEST(testParse_UnhandledXML);
+		CPPUNIT_TEST(testParse_InvalidXML);
+		CPPUNIT_TEST(testParse_InErrorState);
+		CPPUNIT_TEST(testParse_Incremental);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testParse_NestedElements() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse(
+				"<iq type=\"get\">"
+				"<query xmlns='jabber:iq:version'/>"
+				"</iq>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[0].data);
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), client_.events[0].attributes.size());
+			CPPUNIT_ASSERT_EQUAL(String("get"), client_.events[0].attributes["type"]);
+			CPPUNIT_ASSERT_EQUAL(String(), client_.events[0].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("query"), client_.events[1].data);
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), client_.events[1].attributes.size());
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[1].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[2].type);
+			CPPUNIT_ASSERT_EQUAL(String("query"), client_.events[2].data);
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[2].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[3].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[3].data);
+			CPPUNIT_ASSERT_EQUAL(String(), client_.events[3].ns);
+		}
+
+		void testParse_ElementInNamespacedElement() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse(
+				"<query xmlns='jabber:iq:version'>"
+					"<name>Swift</name>"
+				"</query>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(5), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("query"), client_.events[0].data);
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), client_.events[0].attributes.size());
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[0].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("name"), client_.events[1].data);
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[1].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::CharacterData, client_.events[2].type);
+			CPPUNIT_ASSERT_EQUAL(String("Swift"), client_.events[2].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[3].type);
+			CPPUNIT_ASSERT_EQUAL(String("name"), client_.events[3].data);
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[3].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[4].type);
+			CPPUNIT_ASSERT_EQUAL(String("query"), client_.events[4].data);
+			CPPUNIT_ASSERT_EQUAL(String("jabber:iq:version"), client_.events[4].ns);
+		}
+
+		void testParse_CharacterData() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse("<html>bla<i>bli</i>blo</html>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(7), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("html"), client_.events[0].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::CharacterData, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("bla"), client_.events[1].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[2].type);
+			CPPUNIT_ASSERT_EQUAL(String("i"), client_.events[2].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::CharacterData, client_.events[3].type);
+			CPPUNIT_ASSERT_EQUAL(String("bli"), client_.events[3].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[4].type);
+			CPPUNIT_ASSERT_EQUAL(String("i"), client_.events[4].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::CharacterData, client_.events[5].type);
+			CPPUNIT_ASSERT_EQUAL(String("blo"), client_.events[5].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[6].type);
+			CPPUNIT_ASSERT_EQUAL(String("html"), client_.events[6].data);
+		}
+
+		void testParse_NamespacePrefix() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse("<p:x xmlns:p='bla'><p:y/></p:x>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("x"), client_.events[0].data);
+			CPPUNIT_ASSERT_EQUAL(String("bla"), client_.events[0].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("y"), client_.events[1].data);
+			CPPUNIT_ASSERT_EQUAL(String("bla"), client_.events[1].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[2].type);
+			CPPUNIT_ASSERT_EQUAL(String("y"), client_.events[2].data);
+			CPPUNIT_ASSERT_EQUAL(String("bla"), client_.events[2].ns);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[3].type);
+			CPPUNIT_ASSERT_EQUAL(String("x"), client_.events[3].data);
+			CPPUNIT_ASSERT_EQUAL(String("bla"), client_.events[3].ns);
+		}
+
+		void testParse_UnhandledXML() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse("<iq><!-- Testing --></iq>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[0].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[1].data);
+		}
+
+		void testParse_InvalidXML() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(!testling.parse("<iq><bla></iq>"));
+		}
+
+		void testParse_InErrorState() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(!testling.parse("<iq><bla></iq>"));
+			CPPUNIT_ASSERT(!testling.parse("<iq/>"));
+		}
+
+		void testParse_Incremental() {
+			ParserType testling(&client_);
+
+			CPPUNIT_ASSERT(testling.parse("<iq"));
+			CPPUNIT_ASSERT(testling.parse("></iq>"));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), client_.events.size());
+
+			CPPUNIT_ASSERT_EQUAL(Client::StartElement, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[0].data);
+
+			CPPUNIT_ASSERT_EQUAL(Client::EndElement, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(String("iq"), client_.events[1].data);
+		}
+	
+	private:
+		class Client : public XMLParserClient {
+			public:
+				enum Type { StartElement, EndElement, CharacterData };
+				struct Event {
+					Event(
+							Type type, 
+							const String& data, 
+							const String& ns,
+							const AttributeMap& attributes)
+								: type(type), data(data), ns(ns), attributes(attributes) {}
+					Event(Type type, const String& data, const String& ns = String())
+								: type(type), data(data), ns(ns) {}
+
+					Type type;
+					String data;
+					String ns;
+					AttributeMap attributes;
+				};
+
+				Client() {}
+
+				virtual void handleStartElement(const String& element, const String& ns, const AttributeMap& attributes) {
+					events.push_back(Event(StartElement, element, ns, attributes));
+				}
+
+				virtual void handleEndElement(const String& element, const String& ns) {
+					events.push_back(Event(EndElement, element, ns));
+				}
+
+				virtual void handleCharacterData(const String& data) {
+					events.push_back(Event(CharacterData, data));
+				}
+
+				std::vector<Event> events;
+		} client_;
+};
+
+#ifdef HAVE_EXPAT
+CPPUNIT_TEST_SUITE_REGISTRATION(XMLParserTest<ExpatParser>);
+#endif
+#ifdef HAVE_LIBXML
+CPPUNIT_TEST_SUITE_REGISTRATION(XMLParserTest<LibXMLParser>);
+#endif
diff --git a/Swiften/Parser/UnitTest/XMPPParserTest.cpp b/Swiften/Parser/UnitTest/XMPPParserTest.cpp
new file mode 100644
index 0000000..ecdd565
--- /dev/null
+++ b/Swiften/Parser/UnitTest/XMPPParserTest.cpp
@@ -0,0 +1,186 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <vector>
+
+#include "Swiften/Elements/ProtocolHeader.h"
+#include "Swiften/Base/String.h"
+#include "Swiften/Parser/XMPPParser.h"
+#include "Swiften/Parser/ElementParser.h"
+#include "Swiften/Parser/XMPPParserClient.h"
+#include "Swiften/Parser/PayloadParserFactoryCollection.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Elements/IQ.h"
+#include "Swiften/Elements/Message.h"
+#include "Swiften/Elements/StreamFeatures.h"
+#include "Swiften/Elements/UnknownElement.h"
+
+using namespace Swift;
+
+class XMPPParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(XMPPParserTest);
+		CPPUNIT_TEST(testParse_SimpleSession);
+		CPPUNIT_TEST(testParse_SimpleClientFromServerSession);
+		CPPUNIT_TEST(testParse_Presence);
+		CPPUNIT_TEST(testParse_IQ);
+		CPPUNIT_TEST(testParse_Message);
+		CPPUNIT_TEST(testParse_StreamFeatures);
+		CPPUNIT_TEST(testParse_UnknownElement);
+		CPPUNIT_TEST(testParse_StrayCharacterData);
+		CPPUNIT_TEST(testParse_InvalidStreamStart);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		XMPPParserTest() {}
+
+		void testParse_SimpleSession() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<?xml version='1.0'?>"));
+			CPPUNIT_ASSERT(testling.parse("<stream:stream to='example.com' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' >"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+			CPPUNIT_ASSERT(testling.parse("<iq/>"));
+			CPPUNIT_ASSERT(testling.parse("</stream:stream>"));
+
+			CPPUNIT_ASSERT_EQUAL(5, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::StreamStart, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("example.com"), client_.events[0].to); 
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[1].type);
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[2].type);
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[3].type);
+			CPPUNIT_ASSERT_EQUAL(Client::StreamEnd, client_.events[4].type);
+		}
+
+		void testParse_SimpleClientFromServerSession() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<?xml version='1.0'?>"));
+			CPPUNIT_ASSERT(testling.parse("<stream:stream from='example.com' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='aeab'>"));
+
+			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::StreamStart, client_.events[0].type);
+			CPPUNIT_ASSERT_EQUAL(String("example.com"), client_.events[0].from); 
+			CPPUNIT_ASSERT_EQUAL(String("aeab"), client_.events[0].id); 
+		}
+
+
+		void testParse_Presence() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[1].type);
+			CPPUNIT_ASSERT(dynamic_cast<Presence*>(client_.events[1].element.get()));
+		}
+
+		void testParse_IQ() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<iq/>"));
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[1].type);
+			CPPUNIT_ASSERT(dynamic_cast<IQ*>(client_.events[1].element.get()));
+		}
+
+		void testParse_Message() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<message/>"));
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[1].type);
+			CPPUNIT_ASSERT(dynamic_cast<Message*>(client_.events[1].element.get()));
+		}
+
+		void testParse_StreamFeatures() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<stream:features/>"));
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[1].type);
+			CPPUNIT_ASSERT(dynamic_cast<StreamFeatures*>(client_.events[1].element.get()));
+		}
+
+		void testParse_UnknownElement() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+			CPPUNIT_ASSERT(testling.parse("<foo/>"));
+			CPPUNIT_ASSERT(testling.parse("<bar/>"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+
+			CPPUNIT_ASSERT_EQUAL(5, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[2].type);
+			CPPUNIT_ASSERT(dynamic_cast<UnknownElement*>(client_.events[2].element.get()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[3].type);
+			CPPUNIT_ASSERT(dynamic_cast<UnknownElement*>(client_.events[3].element.get()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[4].type);
+			CPPUNIT_ASSERT(dynamic_cast<Presence*>(client_.events[4].element.get()));
+		}
+
+		void testParse_StrayCharacterData() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(testling.parse("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'>"));
+			CPPUNIT_ASSERT(testling.parse("<presence/>"));
+			CPPUNIT_ASSERT(testling.parse("bla"));
+			CPPUNIT_ASSERT(testling.parse("<iq/>"));
+
+			CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(client_.events.size()));
+			CPPUNIT_ASSERT_EQUAL(Client::ElementEvent, client_.events[2].type);
+			CPPUNIT_ASSERT(dynamic_cast<IQ*>(client_.events[2].element.get()));
+		}
+
+		void testParse_InvalidStreamStart() {
+			XMPPParser testling(&client_, &factories_);
+
+			CPPUNIT_ASSERT(!testling.parse("<tream>"));
+		}
+
+	private:
+		class Client : public XMPPParserClient {
+			public:
+				enum Type { StreamStart, ElementEvent, StreamEnd };
+				struct Event {
+					Event(Type type, boost::shared_ptr<Element> element) 
+						: type(type), element(element) {}
+					Event(Type type, const String& from, const String& to, const String& id) : type(type), from(from), to(to), id(id) {}
+
+					Event(Type type) : type(type) {}
+
+					Type type;
+					String from;
+					String to;
+					String id;
+					boost::shared_ptr<Element> element;
+				};
+
+				Client() {}
+
+				void handleStreamStart(const ProtocolHeader& header) {
+					events.push_back(Event(StreamStart, header.getFrom(), header.getTo(), header.getID()));
+				}
+
+				void handleElement(boost::shared_ptr<Element> element) {
+					events.push_back(Event(ElementEvent, element));
+				}
+
+				void handleStreamEnd() {
+					events.push_back(Event(StreamEnd));
+				}
+
+				std::vector<Event> events;
+		} client_;
+		PayloadParserFactoryCollection factories_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(XMPPParserTest);