diff options
| author | Aleksandar Donchev <Aleksandar.Donchev@telemotive.de> | 2017-02-10 11:12:42 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2017-02-20 08:49:44 -0800 |
| commit | b616ca1e864f7530b9dfce4c38f9d24a9f0809c9 (patch) | |
| tree | 5ae3ea6b3de0be38ecbe41e221beccefe64b9629 /AudioManagerCore/test/AmRouterMapTest | |
| parent | 728b43a9289716e62871e21d58c33595e091eef8 (diff) | |
| download | audiomanager-b616ca1e864f7530b9dfce4c38f9d24a9f0809c9.tar.gz | |
* many database observers can be registred now by the database handler.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerCore/test/AmRouterMapTest')
| -rw-r--r-- | AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp | 8 | ||||
| -rw-r--r-- | AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp index d656373..fbba011 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -41,16 +41,16 @@ CAmRouterMapTest::CAmRouterMapTest() : pDatabaseHandler(), pRouter(&pDatabaseHandler, &pControlSender), // pRoutingSender(plistRoutingPluginDirs,dynamic_cast<IAmDatabaseHandler*>( &pDatabaseHandler )), // - pCommandSender(plistCommandPluginDirs), // + pCommandSender(plistCommandPluginDirs, &pSocketHandler), // pMockInterface(), // pMockControlInterface(), // pRoutingInterfaceBackdoor(), // pCommandInterfaceBackdoor(), // pControlInterfaceBackdoor(), // - pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender,&pSocketHandler, &pRouter), // - pObserver(&pCommandSender, &pRoutingSender, &pSocketHandler) + pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender,&pSocketHandler, &pRouter) { - pDatabaseHandler.registerObserver(&pObserver); + pDatabaseHandler.registerObserver(&pRoutingSender); + pDatabaseHandler.registerObserver(&pCommandSender); pCommandInterfaceBackdoor.injectInterface(&pCommandSender, &pMockInterface); pControlInterfaceBackdoor.replaceController(&pControlSender, &pMockControlInterface); } diff --git a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.h b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.h index a3cead1..879f47c 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.h +++ b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.h @@ -34,7 +34,6 @@ #include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" -#include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" #include "CAmSocketHandler.h" @@ -67,7 +66,6 @@ public: IAmCommandBackdoor pCommandInterfaceBackdoor; IAmControlBackdoor pControlInterfaceBackdoor; CAmControlReceiver pControlReceiver; - CAmDatabaseObserver pObserver; CAmCommonFunctions pCF; void SetUp(); void TearDown(); |