Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-27 20:22:11 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-27 20:22:11 (GMT) |
| commit | 1bebb9b3b5d19fd5bfcc0621658a79283e2090db (patch) | |
| tree | 73caa9fbe77ac7ff00ff6dcad3da1ae857cd656c | |
| parent | 2437e403c850c9592fe0fd286398b76d2b27a1b6 (diff) | |
| download | swift-contrib-1bebb9b3b5d19fd5bfcc0621658a79283e2090db.zip swift-contrib-1bebb9b3b5d19fd5bfcc0621658a79283e2090db.tar.bz2 | |
Fix destruction order in unit tests.
4 files changed, 5 insertions, 5 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 9c1cc36..042b7c6 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -98,8 +98,8 @@ public: delete mucRegistry_; delete stanzaChannel_; delete eventController_; - delete iqChannel_; delete iqRouter_; + delete iqChannel_; delete uiEventStream_; delete mucManager_; delete xmppRoster_; diff --git a/Swift/Controllers/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/UnitTest/RosterControllerTest.cpp index df93ca5..fb61820 100644 --- a/Swift/Controllers/UnitTest/RosterControllerTest.cpp +++ b/Swift/Controllers/UnitTest/RosterControllerTest.cpp @@ -80,8 +80,8 @@ class RosterControllerTest : public CppUnit::TestFixture delete mucRegistry_; delete mainWindowFactory_; delete avatarManager_; - delete channel_; delete router_; + delete channel_; delete eventController_; delete subscriptionManager_; delete presenceOracle_; diff --git a/Swiften/Client/UnitTest/NickResolverTest.cpp b/Swiften/Client/UnitTest/NickResolverTest.cpp index f4db2c1..0c5c91b 100644 --- a/Swiften/Client/UnitTest/NickResolverTest.cpp +++ b/Swiften/Client/UnitTest/NickResolverTest.cpp @@ -48,8 +48,8 @@ class NickResolverTest : public CppUnit::TestFixture { delete resolver_; delete registry_; delete vCardManager_; - delete stanzaChannel_; delete iqRouter_; + delete stanzaChannel_; delete vCardStorage_; delete xmppRoster_; } diff --git a/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp index 17c5527..a8585f1 100644 --- a/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp +++ b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp @@ -35,9 +35,9 @@ class XMPPRosterControllerTest : public CppUnit::TestFixture } void tearDown() { - delete channel_; - delete router_; delete xmppRoster_; + delete router_; + delete channel_; } void testAdd() { |