From 27861421a3b5f9045306195710a4c2b7bd1555ea Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 16 Aug 2012 00:47:02 +0200 Subject: tubes: do not include tubes' object files in unit test library Instead link against the library again. Unit test is now closer to what the real app looks like. Only 4 more functions exported because of unit test. Change-Id: I6fd784725564e577658d68ff7fe0595a79cf7639 --- tubes/inc/tubes/contact-list.hxx | 5 ++++- tubes/inc/tubes/manager.hxx | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'tubes/inc') diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx index 6dc4f3212483..cc4ba29bc28f 100644 --- a/tubes/inc/tubes/contact-list.hxx +++ b/tubes/inc/tubes/contact-list.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_TUBES_CONTACT_LIST_HXX #define INCLUDED_TUBES_CONTACT_LIST_HXX +#include + #include #include #include @@ -46,7 +48,8 @@ public: ContactList(TpAccountManager *pAccountManager); ~ContactList(); - AccountContactPairV getContacts(); + // exported for unit test + TUBES_DLLPUBLIC AccountContactPairV getContacts(); private: TpAccountManager* mpAccountManager; diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 22a3daefada6..ce17fd929491 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -81,7 +81,8 @@ public: /** Fetches the contact list. Returns 0 before connect() is called successfully. Is non-functional until prepareAccountManager(). */ - static ContactList* getContactList(); + // exported for unit test + TUBES_DLLPUBLIC static ContactList* getContactList(); /** Start a demo session where all local documents are shared to each other */ static TeleConference* startDemoSession(); @@ -112,7 +113,8 @@ public: @param pBuddy The buddy to be connected. Must be a contact of pAccount. */ - static TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); + // exported for unit test + TUBES_DLLPUBLIC static TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); static void registerCollaboration( Collaboration* pCollaboration ); static void unregisterCollaboration( Collaboration* pCollaboration ); @@ -154,7 +156,8 @@ public: used it must be called before the first TeleManager is instanciated and connects. */ - static void addSuffixToNames( const char* pName ); + // exported for unit test + TUBES_DLLPUBLIC static void addSuffixToNames( const char* pName ); private: static TeleManagerImpl* pImpl; -- cgit