summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-12-27 20:22:11 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-12-27 20:22:11 (GMT)
commit1bebb9b3b5d19fd5bfcc0621658a79283e2090db (patch)
tree73caa9fbe77ac7ff00ff6dcad3da1ae857cd656c /Swiften
parent2437e403c850c9592fe0fd286398b76d2b27a1b6 (diff)
downloadswift-1bebb9b3b5d19fd5bfcc0621658a79283e2090db.zip
swift-1bebb9b3b5d19fd5bfcc0621658a79283e2090db.tar.bz2
Fix destruction order in unit tests.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Client/UnitTest/NickResolverTest.cpp2
-rw-r--r--Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp4
2 files changed, 3 insertions, 3 deletions
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() {