3 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
index 7407f44..4c6ae72 100644
--- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
@@ -150,38 +150,38 @@ public:
 			delete iqRouter;
 			delete stanzaChannel;
 			delete eventLoop;
 		}
 
 		// Tests whether IncomingJingleFileTransfer would accept a IBB only file transfer.
 		void test_AcceptOnyIBBSendsSessionAccept() {
 			//1. create your test incoming file transfer
 			shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-			desc->addOffer(StreamInitiationFileInfo());
+			desc->addOffer(StreamInitiationFileInfo("foo.txt", "", 10));
 			jingleContentPayload->addDescription(desc);
 			JingleIBBTransportPayload::ref tpRef = make_shared<JingleIBBTransportPayload>();
 			tpRef->setSessionID("mysession");
 			jingleContentPayload->addTransport(tpRef);
 
 			shared_ptr<IncomingJingleFileTransfer> fileTransfer = createTestling();
 
 			//2. do 'accept' on a dummy writebytestream (you'll have to look if there already is one)
 			shared_ptr<ByteArrayWriteBytestream> byteStream = make_shared<ByteArrayWriteBytestream>();
 			fileTransfer->accept(byteStream);
 
 			// check whether accept has been called
 			getCall<FakeJingleSession::AcceptCall>(0);
 		}
 
 		void test_OnlyIBBTransferReceiveWorks() {
 			//1. create your test incoming file transfer
 			shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-			desc->addOffer(StreamInitiationFileInfo());
+			desc->addOffer(StreamInitiationFileInfo("file.txt", "", 10));
 			jingleContentPayload->addDescription(desc);
 			JingleIBBTransportPayload::ref tpRef = make_shared<JingleIBBTransportPayload>();
 			tpRef->setSessionID("mysession");
 			jingleContentPayload->addTransport(tpRef);
 
 			shared_ptr<IncomingJingleFileTransfer> fileTransfer = createTestling();
 
 			//2. do 'accept' on a dummy writebytestream (you'll have to look if there already is one)
 			shared_ptr<ByteArrayWriteBytestream> byteStream = make_shared<ByteArrayWriteBytestream>();
@@ -229,19 +229,19 @@ public:
 
 		void test_S5BTransferReceiveTest() {
 			addFileTransferDescription();
 			JingleS5BTransportPayload::ref payLoad = addJingleS5BPayload();
 		}
 
 private:
 	void addFileTransferDescription() {
 		shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-		desc->addOffer(StreamInitiationFileInfo());
+		desc->addOffer(StreamInitiationFileInfo("file.txt", "", 10));
 		jingleContentPayload->addDescription(desc);
 	}
 
 	shared_ptr<JingleS5BTransportPayload> addJingleS5BPayload() {
 		JingleS5BTransportPayload::ref payLoad = make_shared<JingleS5BTransportPayload>();
 		payLoad->setSessionID("mysession");
 		jingleContentPayload->addTransport(payLoad);
 		return payLoad;
 	}
diff --git a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
index 35580bf..75b9faf 100644
--- a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
@@ -183,19 +183,19 @@ public:
 		eventLoop->processEvents();
 
 		helper.unprocessedInput.clear();
 		serverRespondRequestOK();
 		eventLoop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(true, helper.sessionReadyCalled);
 		CPPUNIT_ASSERT_EQUAL(false, helper.sessionReadyError);
 
 		helper.unprocessedInput.clear();
-		ByteArray transferData = generateRandomByteArray(1024 * 1024);
+		ByteArray transferData = generateRandomByteArray(1024);
 		boost::shared_ptr<ByteArrayReadBytestream> input = boost::make_shared<ByteArrayReadBytestream>(transferData);
 		clientSession->startSending(input);
 		eventLoop->processEvents();
 
 		CPPUNIT_ASSERT_EQUAL(createByteArray(transferData.data(), transferData.size()), helper.unprocessedInput);
 	}
 
 
 
diff --git a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
index cd480f0..4fe72c0 100644
--- a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
@@ -90,18 +90,19 @@ class SOCKS5BytestreamServerSessionTest : public CppUnit::TestFixture {
 		void testReceiveData() {
 			boost::shared_ptr<SOCKS5BytestreamServerSession> testling(createSession());
 			StartStopper<SOCKS5BytestreamServerSession> stopper(testling.get());
 			bytestreams->addReadBytestream("abcdef", stream1);
 			authenticate();
 			request("abcdef");
 			eventLoop->processEvents();
 			testling->startTransfer();
 			skipHeader("abcdef");
+			eventLoop->processEvents();
 
 			CPPUNIT_ASSERT(createByteArray("abcdefg") == receivedData);
 			CPPUNIT_ASSERT_EQUAL(2, receivedDataChunks);
 		}
 
 		void testReceiveData_Chunked() {
 			boost::shared_ptr<SOCKS5BytestreamServerSession> testling(createSession());
 			testling->setChunkSize(3);
 			StartStopper<SOCKS5BytestreamServerSession> stopper(testling.get());