diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-30 18:38:07 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-31 17:40:32 +0100 |
| commit | ad0c452e9890a35a1b7a6c2e2421e092c5cf2c2d (patch) | |
| tree | 48cc38fa0a4ada0ece0f8571260c5438b64a675c /PluginCommandInterfaceDbus/test | |
| parent | 58d62c4af578c10375bf9baa946e33f340c42a1f (diff) | |
| download | audiomanager-ad0c452e9890a35a1b7a6c2e2421e092c5cf2c2d.tar.gz | |
* wrapping DLT calls in a new Class because of performance, codesize and lazyness reasons
* the whole project now compiles without a warning with -pedantic
Diffstat (limited to 'PluginCommandInterfaceDbus/test')
5 files changed, 8 insertions, 8 deletions
diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt index c3e136b..0c33420 100644 --- a/PluginCommandInterfaceDbus/test/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt @@ -58,6 +58,7 @@ file(GLOB DBUS_PLUGIN_INTERFACE_SRCS_CXX "../../AudioManagerDaemon/src/DBusWrapper.cpp" "../../AudioManagerDaemon/src/CommandSender.cpp" "../../AudioManagerDaemon/src/SocketHandler.cpp" + "../../AudioManagerDaemon/src/DLTWrapper.cpp" "../src/*.cpp" "dbuscommandpluginInterfaceTest.cpp" "DbusCommanInterfaceBackdoor.cpp" @@ -67,6 +68,7 @@ file(GLOB DBUS_SIGNAL_INTERFACE_SRCS_CXX "../../AudioManagerDaemon/src/DBusWrapper.cpp" "../../AudioManagerDaemon/src/CommandSender.cpp" "../../AudioManagerDaemon/src/SocketHandler.cpp" + "../../AudioManagerDaemon/src/DLTWrapper.cpp" "../src/*.cpp" "dbuscommaninterfacesignalsTest.cpp" "DbusCommandInterfaceBackdoor.cpp" diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp index 1ba6a30..8f7c23f 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp +++ b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp @@ -32,6 +32,7 @@ #include "../include/DBusMessageHandler.h" #include "DbusCommandInterfaceBackdoor.h" #include "MockInterfaces.h" +#include "DLTWrapper.h" using namespace am; using namespace testing; @@ -49,6 +50,7 @@ void* run_the_loop(void* wrapper) dbuscommandpluginInterfaceTest::dbuscommandpluginInterfaceTest() { + DLTWrapper::instance()->registerApp("dbusTest","dbusTest"); } dbuscommandpluginInterfaceTest::~dbuscommandpluginInterfaceTest() diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h index d9f1fca..ae2d14b 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h +++ b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h @@ -29,7 +29,6 @@ #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <dlt/dlt.h> #include <algorithm> #include <string> #include <vector> @@ -39,6 +38,7 @@ #include "MockInterfaces.h" #include "DbusCommandInterfaceBackdoor.h" + #define UNIT_TEST 1 namespace am { diff --git a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp index 1c90d55..9b5adb9 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp +++ b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp @@ -31,23 +31,20 @@ #include "../include/DBusMessageHandler.h" #include "DbusCommandInterfaceBackdoor.h" #include "MockInterfaces.h" +#include "DLTWrapper.h" using namespace am; using namespace testing; -DLT_IMPORT_CONTEXT(DLT_CONTEXT) dbuscommaninterfacesignalsTest::dbuscommaninterfacesignalsTest() { - DLT_REGISTER_APP("DPtest", "RoutingInterfacetest"); - DLT_REGISTER_CONTEXT(DLT_CONTEXT, "Main", "Main Context"); - DLT_LOG(DLT_CONTEXT, DLT_LOG_INFO, DLT_STRING("RoutingSendInterface Test started ")); - + DLTWrapper::instance()->registerApp("dbusTest","dbusTest"); + logInfo("dbusCommandInterfaceSignalTest started"); } dbuscommaninterfacesignalsTest::~dbuscommaninterfacesignalsTest() { - DLT_UNREGISTER_CONTEXT(DLT_CONTEXT); } void* NumberOfMainConnectionsChanged(void*) diff --git a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h index bd99d04..0f930d6 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h +++ b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h @@ -27,7 +27,6 @@ #define DBUSCOMMANINTERFACESIGNALSTEST_H_ #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <dlt/dlt.h> #include <algorithm> #include <string> #include <vector> |