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 /Swift/Controllers/Settings | |
| 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 'Swift/Controllers/Settings')
| -rw-r--r-- | Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp index 5822add..3cfebc7 100644 --- a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp +++ b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp @@ -4,6 +4,8 @@ * See the COPYING file for more information. */ +#include <memory> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> @@ -29,17 +31,11 @@ public: SettingsProviderHierachyTest() : setting1("somekey", 42) {} void setUp() { - bottom = new DummySettingsProvider(); - top = new DummySettingsProvider(); - testling = new SettingsProviderHierachy(); - testling->addProviderToTopOfStack(bottom); - testling->addProviderToTopOfStack(top); - } - - void tearDown() { - delete testling; - delete top; - delete bottom; + bottom = std::unique_ptr<DummySettingsProvider>(new DummySettingsProvider()); + top = std::unique_ptr<DummySettingsProvider>(new DummySettingsProvider()); + testling = std::unique_ptr<SettingsProviderHierachy>(new SettingsProviderHierachy()); + testling->addProviderToTopOfStack(bottom.get()); + testling->addProviderToTopOfStack(top.get()); } void testEmpty() { @@ -82,9 +78,9 @@ public: CPPUNIT_ASSERT_EQUAL(17, testling->getSetting(setting1)); } private: - SettingsProviderHierachy* testling; - DummySettingsProvider* bottom; - DummySettingsProvider* top; + std::unique_ptr<SettingsProviderHierachy> testling; + std::unique_ptr<DummySettingsProvider> bottom; + std::unique_ptr<DummySettingsProvider> top; SettingsProvider::Setting<int> setting1; }; |