Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-03-21 22:33:09 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-03-22 14:54:54 (GMT) |
| commit | f5c2750f56c78d115bb9e8a7c5d50316da98b6d5 (patch) | |
| tree | 661c761e7ebb526e1d71848c127046605e036729 /Swift/Controllers/UnitTest | |
| parent | 37a3ff6afe96c39bbf075d05da72e5f2c684dfa4 (diff) | |
| download | swift-f5c2750f56c78d115bb9e8a7c5d50316da98b6d5.zip swift-f5c2750f56c78d115bb9e8a7c5d50316da98b6d5.tar.bz2 | |
Lots of plumbing for event view.
This isn't ready yet, but clicking on a message in the event view will now cause the chat to pop up, and the plumbing is there for doing something with subscription requests - I just don't, yet.
Diffstat (limited to 'Swift/Controllers/UnitTest')
| -rw-r--r-- | Swift/Controllers/UnitTest/RosterControllerTest.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Swift/Controllers/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/UnitTest/RosterControllerTest.cpp index 0296cdc..67884d0 100644 --- a/Swift/Controllers/UnitTest/RosterControllerTest.cpp +++ b/Swift/Controllers/UnitTest/RosterControllerTest.cpp @@ -8,8 +8,11 @@ // #include "Swiften/Elements/RosterItemPayload.h" // #include "Swiften/Elements/RosterPayload.h" #include "Swiften/Queries/DummyIQChannel.h" +#include "Swiften/Client/DummyStanzaChannel.h" #include "Swiften/Queries/IQRouter.h" #include "Swiften/Roster/XMPPRoster.h" +#include "Swift/Controllers/EventController.h" +#include "Swiften/Presence/PresenceOracle.h" #include "Swift/Controllers/NickResolver.h" using namespace Swift; @@ -30,10 +33,13 @@ class RosterControllerTest : public CppUnit::TestFixture treeWidgetFactory_ = new MockTreeWidgetFactory(); mainWindowFactory_ = new MockMainWindowFactory(treeWidgetFactory_); nickResolver_ = new NickResolver(xmppRoster_); - rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, treeWidgetFactory_, nickResolver_); - channel_ = new DummyIQChannel(); router_ = new IQRouter(channel_); + stanzaChannel_ = new DummyStanzaChannel(); + presenceOracle_ = new PresenceOracle(stanzaChannel_); + eventController_ = new EventController(); + rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, treeWidgetFactory_, nickResolver_, presenceOracle_, eventController_); + }; @@ -45,6 +51,9 @@ class RosterControllerTest : public CppUnit::TestFixture delete avatarManager_; delete channel_; delete router_; + delete eventController_; + delete presenceOracle_; + delete stanzaChannel_; }; void testAdd() { @@ -66,6 +75,9 @@ class RosterControllerTest : public CppUnit::TestFixture NickResolver* nickResolver_; RosterController* rosterController_; DummyIQChannel* channel_; + DummyStanzaChannel* stanzaChannel_; IQRouter* router_; + PresenceOracle* presenceOracle_; + EventController* eventController_; }; |