2 files changed, 8 insertions, 3 deletions
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index d3c0a7c..213948a 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -13,18 +13,19 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Concat.h>
 #include <Swiften/StreamStack/StreamStack.h>
 #include <Swiften/StreamStack/LowLayer.h>
 #include <Swiften/StreamStack/XMPPLayer.h>
 #include <Swiften/StreamStack/StreamLayer.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
 using namespace Swift;
 
 class StreamStackTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(StreamStackTest);
 		CPPUNIT_TEST(testWriteData_NoIntermediateStreamStack);
 		CPPUNIT_TEST(testWriteData_OneIntermediateStream);
@@ -32,19 +33,19 @@ class StreamStackTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testReadData_NoIntermediateStreamStack);
 		CPPUNIT_TEST(testReadData_OneIntermediateStream);
 		CPPUNIT_TEST(testReadData_TwoIntermediateStreamStack);
 		CPPUNIT_TEST(testAddLayer_ExistingOnWriteDataSlot);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 			physicalStream_ = new TestLowLayer();
-			xmppStream_ = new XMPPLayer(&parserFactories_, &serializers_, ClientStreamType);
+			xmppStream_ = new XMPPLayer(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType);
 			elementsReceived_ = 0;
 			dataWriteReceived_ = 0;
 		}
 
 		void tearDown() {
 			delete physicalStream_;
 			delete xmppStream_;
 		}
 
@@ -166,15 +167,16 @@ class StreamStackTest : public CppUnit::TestFixture {
 
 				std::vector<SafeByteArray> data_;
 		};
 
 
 	private:
 		FullPayloadParserFactoryCollection parserFactories_;
 		FullPayloadSerializerCollection serializers_;
 		TestLowLayer* physicalStream_;
+		PlatformXMLParserFactory xmlParserFactory_;
 		XMPPLayer* xmppStream_;
 		int elementsReceived_;
 		int dataWriteReceived_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(StreamStackTest);
diff --git a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
index bb0ce61..8123c00 100644
--- a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
+++ b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
@@ -8,37 +8,38 @@
 #include <boost/bind.hpp>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Elements/ProtocolHeader.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/StreamStack/XMPPLayer.h>
 #include <Swiften/StreamStack/LowLayer.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
 using namespace Swift;
 
 class XMPPLayerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(XMPPLayerTest);
 		CPPUNIT_TEST(testParseData_Error);
 		CPPUNIT_TEST(testResetParser);
 		CPPUNIT_TEST(testResetParser_FromSlot);
 		CPPUNIT_TEST(testWriteHeader);
 		CPPUNIT_TEST(testWriteElement);
 		CPPUNIT_TEST(testWriteFooter);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 			lowLayer_ = new DummyLowLayer();
-			testling_ = new XMPPLayerExposed(&parserFactories_, &serializers_, ClientStreamType);
+			testling_ = new XMPPLayerExposed(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType);
 			testling_->setChildLayer(lowLayer_);
 			elementsReceived_ = 0;
 			errorReceived_ = 0;
 		}
 
 		void tearDown() {
 			delete testling_;
 			delete lowLayer_;
 		}
@@ -106,33 +107,35 @@ class XMPPLayerTest : public CppUnit::TestFixture {
 			++errorReceived_;
 		}
 
 	private:
 		class XMPPLayerExposed : public XMPPLayer {
 			public:
 				XMPPLayerExposed(
 								PayloadParserFactoryCollection* payloadParserFactories,
 								PayloadSerializerCollection* payloadSerializers,
-								StreamType streamType) : XMPPLayer(payloadParserFactories, payloadSerializers, streamType) {}
+								XMLParserFactory* xmlParserFactory,
+								StreamType streamType) : XMPPLayer(payloadParserFactories, payloadSerializers, xmlParserFactory, streamType) {}
 
 				using XMPPLayer::handleDataRead;
 				using HighLayer::setChildLayer;
 		};
 
 		class DummyLowLayer : public LowLayer {
 			public:
 				virtual void writeData(const SafeByteArray& data) {
 					writtenData += byteArrayToString(ByteArray(data.begin(), data.end()));
 				}
 				
 				std::string writtenData;
 		};
 
 		FullPayloadParserFactoryCollection parserFactories_;
 		FullPayloadSerializerCollection serializers_;
 		DummyLowLayer* lowLayer_;
 		XMPPLayerExposed* testling_;
+		PlatformXMLParserFactory xmlParserFactory_;
 		int elementsReceived_;
 		int errorReceived_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(XMPPLayerTest);