diff options
| -rw-r--r-- | Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp | 11 | ||||
| -rw-r--r-- | Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp index 54d2c88..2fb39bb 100644 --- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp +++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp | |||
| @@ -87,19 +87,20 @@ public: | |||
| 87 | ftTransporterFactory = new DefaultFileTransferTransporterFactory(bytestreamRegistry, bytestreamServerManager, bytestreamProxy, idGenerator, connectionFactory, timerFactory, crypto.get(), iqRouter); | 87 | ftTransporterFactory = new DefaultFileTransferTransporterFactory(bytestreamRegistry, bytestreamServerManager, bytestreamProxy, idGenerator, connectionFactory, timerFactory, crypto.get(), iqRouter); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | void tearDown() { | 90 | void tearDown() { |
| 91 | delete ftTransporterFactory; | 91 | delete ftTransporterFactory; |
| 92 | delete networkEnvironment; | ||
| 93 | delete natTraverser; | ||
| 94 | delete bytestreamServerManager; | ||
| 95 | delete bytestreamProxy; | 92 | delete bytestreamProxy; |
| 96 | delete serverConnectionFactory; | ||
| 97 | delete connectionFactory; | ||
| 98 | delete timerFactory; | 93 | delete timerFactory; |
| 94 | delete idGenerator; | ||
| 95 | delete bytestreamServerManager; | ||
| 96 | delete natTraverser; | ||
| 97 | delete networkEnvironment; | ||
| 99 | delete bytestreamRegistry; | 98 | delete bytestreamRegistry; |
| 100 | delete iqRouter; | 99 | delete iqRouter; |
| 100 | delete serverConnectionFactory; | ||
| 101 | delete connectionFactory; | ||
| 101 | delete stanzaChannel; | 102 | delete stanzaChannel; |
| 102 | delete resolver; | 103 | delete resolver; |
| 103 | delete eventLoop; | 104 | delete eventLoop; |
| 104 | Log::setLogLevel(Log::error); | 105 | Log::setLogLevel(Log::error); |
| 105 | } | 106 | } |
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp index 4b2fb50..f3fe42e 100644 --- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp +++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp | |||
| @@ -133,15 +133,15 @@ public: | |||
| 133 | ftTransportFactory = new DummyFileTransferTransporterFactory(s5bRegistry, bytestreamServerManager, s5bProxy, idGen, connectionFactory, timerFactory, crypto.get(), iqRouter); | 133 | ftTransportFactory = new DummyFileTransferTransporterFactory(s5bRegistry, bytestreamServerManager, s5bProxy, idGen, connectionFactory, timerFactory, crypto.get(), iqRouter); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | void tearDown() { | 136 | void tearDown() { |
| 137 | delete ftTransportFactory; | 137 | delete ftTransportFactory; |
| 138 | delete networkEnvironment; | ||
| 139 | delete natTraverser; | ||
| 140 | delete bytestreamServerManager; | ||
| 141 | delete s5bProxy; | 138 | delete s5bProxy; |
| 142 | delete idGen; | 139 | delete idGen; |
| 140 | delete bytestreamServerManager; | ||
| 141 | delete natTraverser; | ||
| 142 | delete networkEnvironment; | ||
| 143 | delete s5bRegistry; | 143 | delete s5bRegistry; |
| 144 | delete serverConnectionFactory; | 144 | delete serverConnectionFactory; |
| 145 | delete connectionFactory; | 145 | delete connectionFactory; |
| 146 | delete timerFactory; | 146 | delete timerFactory; |
| 147 | delete eventLoop; | 147 | delete eventLoop; |
Swift