Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-29 15:22:52 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-09-29 15:22:52 (GMT) |
| commit | 9abfaaa771f91010dbe01a1b9b5b9e2801956718 (patch) | |
| tree | 618a5f66ea97d3d8552f72aad6a8e1313c56ec6e /Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp | |
| parent | 2bf44a1d641c3bc35546cb49d3766f2962f9a984 (diff) | |
| download | swift-9abfaaa771f91010dbe01a1b9b5b9e2801956718.zip swift-9abfaaa771f91010dbe01a1b9b5b9e2801956718.tar.bz2 | |
Fix uninitialised class members
Initialised previously uninitialised class members. Changed
some raw pointers to std::unique_ptr for clearer and
automatically initialised code.
Test-Information:
Builds on macOS 10.12 and unit tests pass in ASAN-enabled
build.
Change-Id: I7900fe6131119c228ca92c79c0ee8125137f2e48
Diffstat (limited to 'Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp')
| -rw-r--r-- | Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp index 2ce67dc..38e67fb 100644 --- a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp +++ b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp @@ -4,6 +4,8 @@ * See the COPYING file for more information. */ +#include <memory> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> @@ -27,17 +29,12 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture { public: void setUp() { - channel = new DummyStanzaChannel(); + channel = std::unique_ptr<DummyStanzaChannel>(new DummyStanzaChannel()); testPresence = std::make_shared<Presence>(); testPresence->setStatus("Foo"); secondTestPresence = std::make_shared<Presence>(); secondTestPresence->setStatus("Bar"); - stanzaChannelPresenceSender = new StanzaChannelPresenceSender(channel); - } - - void tearDown() { - delete stanzaChannelPresenceSender; - delete channel; + stanzaChannelPresenceSender = std::unique_ptr<StanzaChannelPresenceSender>(new StanzaChannelPresenceSender(channel.get())); } void testSendPresence() { @@ -140,12 +137,12 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture { private: DirectedPresenceSender* createPresenceSender() { - return new DirectedPresenceSender(stanzaChannelPresenceSender); + return new DirectedPresenceSender(stanzaChannelPresenceSender.get()); } private: - DummyStanzaChannel* channel; - StanzaChannelPresenceSender* stanzaChannelPresenceSender; + std::unique_ptr<DummyStanzaChannel> channel; + std::unique_ptr<StanzaChannelPresenceSender> stanzaChannelPresenceSender; std::shared_ptr<Presence> testPresence; std::shared_ptr<Presence> secondTestPresence; }; |