1 files changed, 20 insertions, 15 deletions
diff --git a/Swiften/QA/FileTransferTest/FileTransferTest.cpp b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
index 2d2d6c8..8faf8a9 100644
--- a/Swiften/QA/FileTransferTest/FileTransferTest.cpp
+++ b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
@@ -1,40 +1,40 @@
 /*
  * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <fstream>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
-#include <Swiften/Base/sleep.h>
-#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/BoostRandomGenerator.h>
+#include <Swiften/Base/Debug.h>
 #include <Swiften/Base/Log.h>
-#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/sleep.h>
 #include <Swiften/Client/Client.h>
-#include <Swiften/EventLoop/SimpleEventLoop.h>
-#include <Swiften/Network/BoostNetworkFactories.h>
-#include <Swiften/Network/Timer.h>
-#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Disco/ClientDiscoManager.h>
 #include <Swiften/Disco/EntityCapsProvider.h>
 #include <Swiften/Elements/Presence.h>
-#include <Swiften/FileTransfer/ReadBytestream.h>
-#include <Swiften/Base/BoostRandomGenerator.h>
+#include <Swiften/EventLoop/SimpleEventLoop.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
-#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
-#include <Swiften/Disco/ClientDiscoManager.h>
 #include <Swiften/FileTransfer/FileWriteBytestream.h>
-#include <Swiften/Base/Debug.h>
+#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
+#include <Swiften/FileTransfer/ReadBytestream.h>
+#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/Network/Timer.h>
+#include <Swiften/Network/TimerFactory.h>
 
 using namespace Swift;
 
 static const std::string CLIENT_NAME = "Swiften FT Test";
 static const std::string CLIENT_NODE = "http://swift.im";
 
 static boost::shared_ptr<SimpleEventLoop> eventLoop;
 static boost::shared_ptr<BoostNetworkFactories> networkFactories;
 
@@ -53,20 +53,20 @@ class FileTransferTest {
 			sender_ = boost::make_shared<Client>(JID(getenv("SWIFT_FILETRANSFERTEST_JID")), getenv("SWIFT_FILETRANSFERTEST_PASS"), networkFactories.get());
 			sender_->onDisconnected.connect(boost::bind(&FileTransferTest::handleSenderDisconnected, this, _1));
 			sender_->onConnected.connect(boost::bind(&FileTransferTest::handleSenderConnected, this));
 			sender_->getEntityCapsProvider()->onCapsChanged.connect(boost::bind(&FileTransferTest::handleSenderCapsChanged, this, _1));
 
 			receiver_ = boost::make_shared<Client>(JID(getenv("SWIFT_FILETRANSFERTEST2_JID")), getenv("SWIFT_FILETRANSFERTEST2_PASS"), networkFactories.get());
 			receiver_->onConnected.connect(boost::bind(&FileTransferTest::handleReceiverConnected, this));
 			receiver_->onDisconnected.connect(boost::bind(&FileTransferTest::handleReceiverDisconnected, this, _1));
 
-			new ClientXMLTracer(sender_.get());
-			new ClientXMLTracer(receiver_.get());
+			senderTracer_ = new ClientXMLTracer(sender_.get());
+			receiverTracer_ = new ClientXMLTracer(receiver_.get());
 
 			ClientOptions options;
 			options.useTLS = ClientOptions::NeverUseTLS;
 			options.useStreamCompression = false;
 			options.useStreamResumption = false;
 			options.useAcks = false;
 
 			sender_->connect(options);
 			receiver_->connect(options);
@@ -86,18 +86,21 @@ class FileTransferTest {
 
 			std::ofstream outfile(sendFilePath_.native().c_str(), std::ios::out | std::ios::binary);
 			outfile.write(reinterpret_cast<char *>(&sendData_[0]), sendData_.size());
 			outfile.close();
 		}
 
 		~FileTransferTest() {
 			timeOut_->stop();
 
+			delete senderTracer_;
+			delete receiverTracer_;
+
 			if(boost::filesystem::exists(sendFilePath_)) {
 				boost::filesystem::remove(sendFilePath_);
 			}
 
 			if(boost::filesystem::exists(receiveFilePath_)) {
 				boost::filesystem::remove(receiveFilePath_);
 			}
 		}
 
@@ -233,26 +236,28 @@ class FileTransferTest {
 		}
 
 		bool wasSuccessful() const {
 			return !senderError_ && !receiverError_;
 		}
 
 	private:
 		int senderCandidates_;
 		boost::shared_ptr<Client> sender_;
+		ClientXMLTracer* senderTracer_;
 		ByteArray sendData_;
 		OutgoingFileTransfer::ref outgoingFileTransfer_;
 		boost::filesystem::path sendFilePath_;
 		boost::optional<FileTransferError> senderError_;
 		bool senderIsDone_;
 
 		int receiverCandidates_;
 		boost::shared_ptr<Client> receiver_;
+		ClientXMLTracer* receiverTracer_;
 		ByteArray receiveData_;
 		std::vector<IncomingFileTransfer::ref> incomingFileTransfers_;
 		boost::filesystem::path receiveFilePath_;
 		boost::optional<FileTransferError> receiverError_;
 		bool receiverIsDone_;
 
 		Timer::ref timeOut_;
 };