* include google test into source tree

Signed-off-by: christian linke <christian.linke@bmw.de>

4 files changed, 15 insertions, 14 deletions

diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
index 8d396dc..05b829b 100644
--- a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
+++ b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
@@ -34,6 +34,7 @@ DLT_DECLARE_CONTEXT(commandDbus)
  */
 extern "C" IAmCommandSend* PluginCommandInterfaceDbusFactory()
 {
+    CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
     return (new CAmCommandSenderDbus());
 }
 
diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
index d577ad8..f7cf4d6 100644
--- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
+++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
@@ -38,7 +38,7 @@ CAmDbusMessageHandler::CAmDbusMessageHandler() :
         mpReveiveMessage(NULL), //
         mpDBusConnection(NULL)
 {
-    CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
+   // CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
     log(&commandDbus, DLT_LOG_INFO, "DBusMessageHandler constructed");
 }
 
diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
index 8add391..aa2a1d4 100644
--- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
@@ -109,7 +109,7 @@ arg0=list;
 ACTION(returnListMainSinkSoundProperties){
 std::vector<am::am_MainSoundProperty_s> list;
 am::am_MainSoundProperty_s listItem;
-listItem.type=MSP_MAX;
+listItem.type=MSP_EXAMPLE_MID;
 listItem.value=223;
 list.push_back(listItem);
 listItem.type=MSP_UNKNOWN;
@@ -481,7 +481,7 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(4), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
     }
     ifs.close();
 
@@ -506,7 +506,7 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(4), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
     }
     ifs.close();
 
diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 5aa3e8d..41a6aad 100644
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -22,14 +22,13 @@ PROJECT(CAmCommandSenderDbusTests)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
 set(STD_INCLUDE_DIRS "/usr/include")
-
 set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
-FIND_PACKAGE(GTest REQUIRED) 
 
-find_package (Threads)
+FIND_PACKAGE(Threads)
 FIND_PACKAGE(DBUS REQUIRED)
 FIND_PACKAGE(PkgConfig)
-find_package(PythonLibs REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
+FIND_PACKAGE(GMock REQUIRED)
 
 IF(WITH_DLT)    
     pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0)   
@@ -47,7 +46,8 @@ INCLUDE_DIRECTORIES(
     ${DBUS_INCLUDE_DIR}
     ${INCLUDE_FOLDER}
     ${PYTHON_INCLUDE_DIRS}
-    ${GTEST_INCLUDE_DIR}
+    ${GOOGLE_TEST_INCLUDE_DIR}
+    ${GMOCK_INCLUDE_DIR}
     "../../AudioManagerDaemon/include"
     "../include"
 )
@@ -80,8 +80,8 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusTest
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${PYTHON_LIBRARY}
-    ${GTEST_LIBRARIES}
-    gmock
+    gtest
+    ${GMOCK_LIBRARY}
 )
 
 
@@ -91,8 +91,8 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusSignalTest
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${PYTHON_LIBRARY}
-    ${GTEST_LIBRARIES}
-    gmock
+    gtest
+    ${GMOCK_LIBRARY}
 )
 
 INSTALL(TARGETS AmCommandSenderDbusTest 
@@ -107,6 +107,6 @@ INSTALL(TARGETS AmCommandSenderDbusSignalTest
         COMPONENT tests
 )
 
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "gtest" "google-mock" "libpthread-stubs0")
 set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")