2 files changed, 18 insertions, 9 deletions
diff --git a/Swiften/FileTransfer/UnitTest/DummyFileTransferTransporterFactory.h b/Swiften/FileTransfer/UnitTest/DummyFileTransferTransporterFactory.h
index 324404d..00a931f 100644
--- a/Swiften/FileTransfer/UnitTest/DummyFileTransferTransporterFactory.h
+++ b/Swiften/FileTransfer/UnitTest/DummyFileTransferTransporterFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,19 +9,20 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/StringCodecs/Hexify.h>
 #include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/FileTransferTransporter.h>
 #include <Swiften/FileTransfer/FileTransferTransporterFactory.h>
 #include <Swiften/FileTransfer/IBBReceiveSession.h>
 #include <Swiften/FileTransfer/IBBReceiveTransportSession.h>
-#include <Swiften/FileTransfer/IBBSendTransportSession.h>
 #include <Swiften/FileTransfer/IBBSendSession.h>
+#include <Swiften/FileTransfer/IBBSendTransportSession.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 #include <Swiften/JID/JID.h>
+#include <Swiften/StringCodecs/Hexify.h>
 
 namespace Swift {
 
@@ -45,7 +46,7 @@ public:
 			TimerFactory*,
 			CryptoProvider* cryptoProvider,
 			IQRouter* iqRouter,
-			const FileTransferOptions&) : initiator_(initiator), responder_(responder), role_(role), s5bRegistry_(s5bRegistry), crypto_(cryptoProvider), iqRouter_(iqRouter) {
+			const FileTransferOptions& ftOptions) : initiator_(initiator), responder_(responder), role_(role), s5bRegistry_(s5bRegistry), crypto_(cryptoProvider), iqRouter_(iqRouter), ftOptions_(ftOptions) {
 
 	}
 
@@ -55,6 +56,12 @@ public:
 
 	virtual void startGeneratingLocalCandidates() {
 		std::vector<JingleS5BTransportPayload::Candidate> candidates;
+		if (ftOptions_.isDirectAllowed()) {
+			JingleS5BTransportPayload::Candidate candidate;
+			candidate.cid = "123";
+			candidate.priority = 1235;
+			candidates.push_back(candidate);
+		}
 		onLocalCandidatesGenerated(s5bSessionID_, candidates, getSOCKS5DstAddr());
 	}
 
@@ -139,6 +146,7 @@ private:
 	CryptoProvider* crypto_;
 	std::string s5bSessionID_;
 	IQRouter* iqRouter_;
+	FileTransferOptions ftOptions_;
 };
 
 class DummyFileTransferTransporterFactory : public FileTransferTransporterFactory {
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
index f3fe42e..fee26d5 100644
--- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2015 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -81,7 +81,7 @@ class OutgoingJingleFileTransferTest : public CppUnit::TestFixture {
 
 public:
 
-		boost::shared_ptr<OutgoingJingleFileTransfer> createTestling() {
+		boost::shared_ptr<OutgoingJingleFileTransfer> createTestling(const FileTransferOptions& options = FileTransferOptions().withAssistedAllowed(false).withDirectAllowed(false).withProxiedAllowed(false)) {
 			JID to("test@foo.com/bla");
 			JingleFileTransferFileInfo fileInfo;
 			fileInfo.setDescription("some file");
@@ -96,7 +96,7 @@ public:
 				timerFactory,
 				idGen,
 				fileInfo,
-				FileTransferOptions().withAssistedAllowed(false).withDirectAllowed(false).withProxiedAllowed(false),
+				options,
 				crypto.get()));
 		}
 
@@ -159,16 +159,17 @@ public:
 			CPPUNIT_ASSERT(description);
 			CPPUNIT_ASSERT(static_cast<size_t>(1048576) == description->getFileInfo().getSize());
 
-			JingleS5BTransportPayload::ref transport = boost::dynamic_pointer_cast<JingleS5BTransportPayload>(call.payload);
+			JingleIBBTransportPayload::ref transport = boost::dynamic_pointer_cast<JingleIBBTransportPayload>(call.payload);
 			CPPUNIT_ASSERT(transport);
 		}
 		
 		void test_FallbackToIBBAfterFailingS5B() {
-			boost::shared_ptr<OutgoingJingleFileTransfer> transfer = createTestling();
+			boost::shared_ptr<OutgoingJingleFileTransfer> transfer = createTestling(FileTransferOptions().withAssistedAllowed(true).withDirectAllowed(true).withProxiedAllowed(true));
 			transfer->start();
 
 			FakeJingleSession::InitiateCall call = getCall<FakeJingleSession::InitiateCall>(0);
 
+			CPPUNIT_ASSERT(boost::dynamic_pointer_cast<JingleS5BTransportPayload>(call.payload));
 			fakeJingleSession->handleSessionAcceptReceived(call.id, call.description, call.payload);
 
 			// send candidate failure