Swiftdiff options
Diffstat (limited to 'Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp')
| -rw-r--r-- | Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp index aaf90ea..54d2c88 100644 --- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp +++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp | |||
| @@ -10,39 +10,39 @@ | |||
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <cppunit/extensions/HelperMacros.h> | 13 | #include <iostream> |
| 14 | #include <cppunit/extensions/TestFactoryRegistry.h> | ||
| 15 | 14 | ||
| 16 | #include <boost/smart_ptr/make_shared.hpp> | 15 | #include <boost/smart_ptr/make_shared.hpp> |
| 17 | 16 | ||
| 17 | #include <cppunit/extensions/HelperMacros.h> | ||
| 18 | #include <cppunit/extensions/TestFactoryRegistry.h> | ||
| 19 | |||
| 18 | #include <Swiften/Base/ByteArray.h> | 20 | #include <Swiften/Base/ByteArray.h> |
| 19 | #include <Swiften/Base/Override.h> | ||
| 20 | #include <Swiften/Base/Log.h> | 21 | #include <Swiften/Base/Log.h> |
| 22 | #include <Swiften/Base/Override.h> | ||
| 21 | #include <Swiften/Client/DummyStanzaChannel.h> | 23 | #include <Swiften/Client/DummyStanzaChannel.h> |
| 24 | #include <Swiften/Crypto/CryptoProvider.h> | ||
| 25 | #include <Swiften/Crypto/PlatformCryptoProvider.h> | ||
| 22 | #include <Swiften/Elements/IBB.h> | 26 | #include <Swiften/Elements/IBB.h> |
| 27 | #include <Swiften/Elements/JingleFileTransferDescription.h> | ||
| 23 | #include <Swiften/Elements/JingleIBBTransportPayload.h> | 28 | #include <Swiften/Elements/JingleIBBTransportPayload.h> |
| 24 | #include <Swiften/Elements/JingleS5BTransportPayload.h> | 29 | #include <Swiften/Elements/JingleS5BTransportPayload.h> |
| 25 | #include <Swiften/Elements/JingleFileTransferDescription.h> | 30 | #include <Swiften/EventLoop/DummyEventLoop.h> |
| 26 | #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h> | ||
| 27 | #include <Swiften/FileTransfer/ByteArrayWriteBytestream.h> | 31 | #include <Swiften/FileTransfer/ByteArrayWriteBytestream.h> |
| 32 | #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h> | ||
| 28 | #include <Swiften/FileTransfer/IncomingJingleFileTransfer.h> | 33 | #include <Swiften/FileTransfer/IncomingJingleFileTransfer.h> |
| 29 | #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h> | ||
| 30 | #include <Swiften/Network/PlatformNetworkEnvironment.h> | ||
| 31 | #include <Swiften/Network/StaticDomainNameResolver.h> | ||
| 32 | #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h> | 34 | #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h> |
| 35 | #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h> | ||
| 33 | #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h> | 36 | #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h> |
| 34 | #include <Swiften/Jingle/FakeJingleSession.h> | 37 | #include <Swiften/Jingle/FakeJingleSession.h> |
| 35 | #include <Swiften/Network/NATTraverser.h> | ||
| 36 | #include <Swiften/Network/DummyTimerFactory.h> | ||
| 37 | #include <Swiften/EventLoop/DummyEventLoop.h> | ||
| 38 | #include <Swiften/Network/DummyConnectionFactory.h> | 38 | #include <Swiften/Network/DummyConnectionFactory.h> |
| 39 | #include <Swiften/Network/DummyConnectionServerFactory.h> | 39 | #include <Swiften/Network/DummyConnectionServerFactory.h> |
| 40 | #include <Swiften/Network/DummyTimerFactory.h> | ||
| 41 | #include <Swiften/Network/NATTraverser.h> | ||
| 40 | #include <Swiften/Network/PlatformNATTraversalWorker.h> | 42 | #include <Swiften/Network/PlatformNATTraversalWorker.h> |
| 43 | #include <Swiften/Network/PlatformNetworkEnvironment.h> | ||
| 44 | #include <Swiften/Network/StaticDomainNameResolver.h> | ||
| 41 | #include <Swiften/Queries/IQRouter.h> | 45 | #include <Swiften/Queries/IQRouter.h> |
| 42 | #include <Swiften/Crypto/CryptoProvider.h> | ||
| 43 | #include <Swiften/Crypto/PlatformCryptoProvider.h> | ||
| 44 | |||
| 45 | #include <iostream> | ||
| 46 | 46 | ||
| 47 | using namespace Swift; | 47 | using namespace Swift; |
| 48 | using namespace boost; | 48 | using namespace boost; |
| @@ -89,8 +89,11 @@ public: | |||
| 89 | 89 | ||
| 90 | void tearDown() { | 90 | void tearDown() { |
| 91 | delete ftTransporterFactory; | 91 | delete ftTransporterFactory; |
| 92 | delete networkEnvironment; | ||
| 93 | delete natTraverser; | ||
| 92 | delete bytestreamServerManager; | 94 | delete bytestreamServerManager; |
| 93 | delete bytestreamProxy; | 95 | delete bytestreamProxy; |
| 96 | delete serverConnectionFactory; | ||
| 94 | delete connectionFactory; | 97 | delete connectionFactory; |
| 95 | delete timerFactory; | 98 | delete timerFactory; |
| 96 | delete bytestreamRegistry; | 99 | delete bytestreamRegistry; |