Updating IContext to our current style and making it less reliant on macros.

Updating code that uses IContext to a more conformant pattern of usage.
This commit is contained in:
Mathew Sutcliffe
2013-10-05 18:12:16 +01:00
parent 01af31d4da
commit e607121cc4
26 changed files with 235 additions and 200 deletions

View File

@@ -17,17 +17,17 @@ namespace BlackCoreTest
void CTestNetMediators::initTestCase()
{
BlackMisc::IContext::getInstance().setSingleton<INetwork>(&m_networkDummy);
m_context.setObject<INetwork>(m_networkDummy);
}
void CTestNetMediators::cleanupTestCase()
{
BlackMisc::IContext::getInstance().releaseSingleton<INetwork>();
m_context.removeObject<INetwork>();
}
void CTestNetMediators::atcListManagerTest()
{
CAtcListManager mgr;
CAtcListManager mgr(m_context);
AtcListConsumer cons;
QObject::connect(&mgr, &IAtcListManager::listChanged, &cons, &AtcListConsumer::listChanged);

View File

@@ -45,6 +45,7 @@ namespace BlackCoreTest
void cleanupTestCase();
private:
BlackMisc::CApplicationContext m_context;
BlackCore::NetworkDummy m_networkDummy;
};