Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/FileTransfer/UnitTest
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-30 07:02:01 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-07-07 19:58:12 (GMT)
commit799a7ac203dc2576872894dfdd1adb5cdbbacf7b (patch)
treee0242decf49222b83674143cf04f61c3dc01bc35 /Swiften/FileTransfer/UnitTest
parentabd96284e162b3594bd0fc90a5da6b78709dee23 (diff)
downloadswift-799a7ac203dc2576872894dfdd1adb5cdbbacf7b.zip
swift-799a7ac203dc2576872894dfdd1adb5cdbbacf7b.tar.bz2
Fix memory leaks reported by ASAN
Test-Information: Tested on Elementary OS with a LLVM/Clang 3.7.0 build. With this patch the reports for the fixed locations are gone. Change-Id: I0260fc85ad662335a69ace331f51ebe2f864ef97
Diffstat (limited to 'Swiften/FileTransfer/UnitTest')
-rw-r--r--Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp33
-rw-r--r--Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp11
2 files changed, 25 insertions, 19 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
47using namespace Swift; 47using namespace Swift;
48using namespace boost; 48using 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;
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
index 0186e0b..40e7233 100644
--- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
@@ -10,13 +10,15 @@
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/bind.hpp> 15#include <boost/bind.hpp>
17#include <boost/optional.hpp> 16#include <boost/optional.hpp>
18#include <boost/smart_ptr/make_shared.hpp> 17#include <boost/smart_ptr/make_shared.hpp>
19 18
19#include <cppunit/extensions/HelperMacros.h>
20#include <cppunit/extensions/TestFactoryRegistry.h>
21
20#include <Swiften/Base/ByteArray.h> 22#include <Swiften/Base/ByteArray.h>
21#include <Swiften/Base/IDGenerator.h> 23#include <Swiften/Base/IDGenerator.h>
22#include <Swiften/Base/Override.h> 24#include <Swiften/Base/Override.h>
@@ -47,8 +49,6 @@
47#include <Swiften/Network/PlatformNetworkEnvironment.h> 49#include <Swiften/Network/PlatformNetworkEnvironment.h>
48#include <Swiften/Queries/IQRouter.h> 50#include <Swiften/Queries/IQRouter.h>
49 51
50#include <iostream>
51
52using namespace Swift; 52using namespace Swift;
53 53
54class OutgoingJingleFileTransferTest : public CppUnit::TestFixture { 54class OutgoingJingleFileTransferTest : public CppUnit::TestFixture {
@@ -123,10 +123,13 @@ public:
123 123
124 void tearDown() { 124 void tearDown() {
125 delete ftTransportFactory; 125 delete ftTransportFactory;
126 delete networkEnvironment;
127 delete natTraverser;
126 delete bytestreamServerManager; 128 delete bytestreamServerManager;
127 delete s5bProxy; 129 delete s5bProxy;
128 delete idGen; 130 delete idGen;
129 delete s5bRegistry; 131 delete s5bRegistry;
132 delete serverConnectionFactory;
130 delete connectionFactory; 133 delete connectionFactory;
131 delete timerFactory; 134 delete timerFactory;
132 delete eventLoop; 135 delete eventLoop;