1 files changed, 23 insertions, 2 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp
index 02c2f7d..005fc09 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp
@@ -7,14 +7,16 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/Parser/PayloadParsers/ErrorParser.h"
-#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h"
+#include <Swiften/Parser/PayloadParsers/ErrorParser.h>
+#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
+#include <Swiften/Elements/Delay.h>
 
 using namespace Swift;
 
 class ErrorParserTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(ErrorParserTest);
 		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST(testParseWithPayload);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -31,7 +33,26 @@ class ErrorParserTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(ErrorPayload::BadRequest, payload->getCondition());
 			CPPUNIT_ASSERT_EQUAL(ErrorPayload::Modify, payload->getType());
 			CPPUNIT_ASSERT_EQUAL(std::string("boo"), payload->getText());
+			CPPUNIT_ASSERT(!payload->getPayload());
 		}
+
+		void testParseWithPayload() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse(
+					"<error type=\"modify\">"
+					"<bad-request xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+					"<delay xmlns='urn:xmpp:delay' from='juliet@capulet.com/balcony' stamp='2002-09-10T23:41:07Z'/>"
+					"<text xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">boo</text>"
+					"</error>"));
+
+			ErrorPayload::ref payload = boost::dynamic_pointer_cast<ErrorPayload>(parser.getPayload());
+			CPPUNIT_ASSERT_EQUAL(ErrorPayload::BadRequest, payload->getCondition());
+			CPPUNIT_ASSERT_EQUAL(ErrorPayload::Modify, payload->getType());
+			CPPUNIT_ASSERT_EQUAL(std::string("boo"), payload->getText());
+			CPPUNIT_ASSERT(boost::dynamic_pointer_cast<Delay>(payload->getPayload()));
+		}
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ErrorParserTest);