Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-03-01 21:00:49 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-03-27 23:01:57 (GMT) |
| commit | 1d09d9ead06be72ee0c4026aa027cd90e6f1546b (patch) | |
| tree | 02864423c5a06a29fafabcc3e2fdd764fd831806 /Swiften/Jingle | |
| parent | dde0c6a3d4c437d7178f5db628feb4f3a04a22f2 (diff) | |
| download | swift-1d09d9ead06be72ee0c4026aa027cd90e6f1546b.zip swift-1d09d9ead06be72ee0c4026aa027cd90e6f1546b.tar.bz2 | |
Fix OutgoingJingleFileTransferTest and enable it again
Test-Information:
Unit tests pass.
Change-Id: I793fb65fd2e760daddab0142abc33d4aa5b4fce5
Diffstat (limited to 'Swiften/Jingle')
| -rw-r--r-- | Swiften/Jingle/FakeJingleSession.cpp | 18 | ||||
| -rw-r--r-- | Swiften/Jingle/FakeJingleSession.h | 10 |
2 files changed, 26 insertions, 2 deletions
diff --git a/Swiften/Jingle/FakeJingleSession.cpp b/Swiften/Jingle/FakeJingleSession.cpp index 3b94da7..864dd53 100644 --- a/Swiften/Jingle/FakeJingleSession.cpp +++ b/Swiften/Jingle/FakeJingleSession.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -61,4 +61,20 @@ void FakeJingleSession::handleTransportReplaceReceived(const JingleContentID& co notifyListeners(&JingleSessionListener::handleTransportReplaceReceived, contentID, transport); } +void FakeJingleSession::handleTransportAcceptReceived(const JingleContentID& contentID, JingleTransportPayload::ref transport) { + notifyListeners(&JingleSessionListener::handleTransportAcceptReceived, contentID, transport); +} + +void FakeJingleSession::handleTransportInfoReceived(const JingleContentID& contentID, JingleTransportPayload::ref transport) { + notifyListeners(&JingleSessionListener::handleTransportInfoReceived, contentID, transport); +} + +void FakeJingleSession::handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) { + notifyListeners(&JingleSessionListener::handleSessionTerminateReceived, reason); +} + +void FakeJingleSession::handleSessionAcceptReceived(const JingleContentID& contentID, boost::shared_ptr<JingleDescription> desc, boost::shared_ptr<JingleTransportPayload> payload) { + notifyListeners(&JingleSessionListener::handleSessionAcceptReceived, contentID, desc, payload); +} + } diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h index 19028ad..f250b1a 100644 --- a/Swiften/Jingle/FakeJingleSession.h +++ b/Swiften/Jingle/FakeJingleSession.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -96,7 +96,15 @@ namespace Swift { virtual void sendTransportReject(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE; virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE; + void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>); + void handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>); + void handleSessionInfoReceived(boost::shared_ptr<JinglePayload>); + void handleTransportReplaceReceived(const JingleContentID&, JingleTransportPayload::ref); + void handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>); + void handleTransportInfoReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>); + void handleTransportRejectReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>); + void handleTransportInfoAcknowledged(const std::string& id); public: std::vector<Command> calledCommands; |