diff options
| author | Christian Linke <christian.linke@bmw.de> | 2015-03-12 13:43:48 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-03-12 13:43:48 +0100 |
| commit | 6ffbf25bacf589879198e49ac227cb56e261b7c9 (patch) | |
| tree | e6b3ca48d22d06d43da638b1998ab1220ec7ab08 /AudioManagerDaemon/test | |
| parent | c628fa5304171cd827f56aa475668d99d26ad28a (diff) | |
| download | audiomanager-6ffbf25bacf589879198e49ac227cb56e261b7c9.tar.gz | |
* fully rework. Plugins have now a new own git repository
* building out of source of plugins without AM workss
* build system cmake contructions is different now
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test')
38 files changed, 416 insertions, 528 deletions
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index 2dd059f..b20a4f7 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -23,7 +23,7 @@ #include <string> #include <vector> #include <set> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; @@ -32,7 +32,6 @@ DLT_DECLARE_CONTEXT(AudioManager) CAmControlInterfaceTest::CAmControlInterfaceTest() : pSocketHandler(), // - pDBusWrapper((CAmDbusWrapper*) 1), // plistCommandPluginDirs(), // plistRoutingPluginDirs(), // pDatabaseHandler(), // @@ -47,7 +46,7 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() : pRouter(&pDatabaseHandler,&pControlSender), // pDatabaseObserver(&pCommandSender, &pRoutingSender, &pSocketHandler), // pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender, &pSocketHandler, &pRouter), // - pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, &pSocketHandler, pDBusWrapper) + pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, &pSocketHandler) { CAmDltWrapper::instance(0)->registerApp("AudioManagerDeamon", "AudioManagerDeamon"); CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context"); diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index 861b9ac..92ebb4f 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -38,8 +38,7 @@ #include "../CAmCommonFunctions.h" #include "../MockIAmRoutingSend.h" #include "../MockIAmControlSend.h" -#include "shared/CAmSocketHandler.h" -#include "shared/CAmDbusWrapper.h" +#include "CAmSocketHandler.h" namespace am { @@ -50,7 +49,6 @@ public: CAmControlInterfaceTest(); ~CAmControlInterfaceTest(); CAmSocketHandler pSocketHandler; - CAmDbusWrapper* pDBusWrapper; std::vector<std::string> plistCommandPluginDirs; std::vector<std::string> plistRoutingPluginDirs; CAmDatabaseHandlerMap pDatabaseHandler; diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index a2238b1..33a2f8b 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -7,88 +7,82 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmControlInterfaceTest) +project(AmControlInterfaceTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DATABASE_STORAGE) pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${SQLITE_LIBRARIES}) +endif(WITH_DATABASE_STORAGE) -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} - ${GMOCK_INCLUDE_DIR} -) + ${GMOCK_INCLUDE_DIR}) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - -ADD_EXECUTABLE(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) +add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock) INSTALL(TARGETS AmControlInterfaceTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + COMPONENT tests) diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 85a4c44..e5f9745 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -23,7 +23,7 @@ #include <string> #include <vector> #include <set> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h index b23aba4..3ebd156 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -38,7 +38,7 @@ #include "../CAmCommonFunctions.h" #include "../MockIAmControlSend.h" #include "../MockIAmCommandSend.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 99dd576..85741d8 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -7,87 +7,87 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmDatabaseHandlerTest) +project(AmDatabaseHandlerTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +#only build this test if sqlite is requested +if(WITH_DATABASE_STORAGE) -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) + set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + pkg_check_modules(SQLITE REQUIRED sqlite3) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} - ${INCLUDE_FOLDER} - ${GOOGLE_TEST_INCLUDE_DIR} - ${GMOCK_INCLUDE_DIR} -) - -file(GLOB DATABASE_SRCS_CXX - "../../src/CAmDatabaseHandlerSQLite.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" - "../CAmCommonFunctions.cpp" - "*.cpp" + if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) + endif(WITH_DLT) + + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ${AUDIO_INCLUDE_FOLDER} + ${CMAKE_SOURCE_DIR} + ${STD_INCLUDE_DIRS} + ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - -ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} - gtest - gmock -) - -ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) - -INSTALL(TARGETS AmDatabaseHandlerTest - DESTINATION "~/AudioManagerTest/" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") -ENDIF(WITH_DATABASE_STORAGE) + if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) + endif(WITH_DLT) + + file(GLOB DATABASE_SRCS_CXX + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerSQLite.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "../CAmCommonFunctions.cpp" + "*.cpp" + ) + + + ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX}) + + TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest + ${AM_LINK_LIBS} + ${SQLITE_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} + gtest + gmock + ) + + ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) + + INSTALL(TARGETS AmDatabaseHandlerTest + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests + ) + +endif(WITH_DATABASE_STORAGE) diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp index df72f2d..3ad5713 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 * * For further information see http://www.genivi.org/. @@ -25,7 +25,7 @@ #include <vector> #include <set> #include <ios> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h index f35aa0b..ae9b0f1 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 * * For further information see http://www.genivi.org/. @@ -27,7 +27,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt index 0381966..b4555e1 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt @@ -7,73 +7,67 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmMapHandlerTest) +project(AmMapHandlerTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -FIND_PACKAGE(PkgConfig) -#pkg_check_modules(SQLITE REQUIRED sqlite3) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + file(GLOB DATABASE_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "CAmTestDatabaseObserver.cpp" "*.cpp" ) -IF(WITH_NSM) - IF(WITH_DBUS_WRAPPER) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") - ENDIF() -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmMapHandlerTest ${DATABASE_SRCS_CXX}) TARGET_LINK_LIBRARIES( AmMapHandlerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} gtest @@ -83,11 +77,8 @@ TARGET_LINK_LIBRARIES( AmMapHandlerTest ADD_DEPENDENCIES(AmMapHandlerTest gtest gmock) INSTALL(TARGETS AmMapHandlerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp index e41e556..6eaf75a 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp @@ -20,8 +20,8 @@ */ #include "CAmNodeStateCommunicatorTest.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" #include <unistd.h> diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h index c6a9a5a..d86b9c5 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h @@ -29,7 +29,7 @@ #include "gmock/gmock.h" #include "../IAmControlBackdoor.h" #include "../MockIAmControlSend.h" -#include "shared/CAmCommonAPIWrapper.h" +#include "CAmCommonAPIWrapper.h" using namespace testing; using namespace am; diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt index 3a58b24..018d71a 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt @@ -15,71 +15,66 @@ # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmNodeStateCommunicatorCAPITest) +project(AmNodeStateCommunicatorCAPITest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1") -set(STD_INCLUDE_DIRS "/usr/include") +find_package(Threads) +find_package(CommonAPI REQUIRED) +find_package(PythonLibs REQUIRED) -set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) - -FIND_PACKAGE(Threads) -FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(CommonAPI REQUIRED) -IF(WITH_DATABASE_STORAGE) - pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) +if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( - ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${DLT_INCLUDE_DIRS} - ${INCLUDE_FOLDER} ${PYTHON_INCLUDE_DIRS} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} - "../../include" ${COMMON_API_INCLUDE_DIRS} ${COMMON_API_DBUS_INCLUDE_DIRS} ${COMMON_API_GEN_INCLUDE_DIR} ) +if(WITH_DLT) +INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + -file(GLOB NODESTATECOMMUNICATORCAPI - "../../src/CAmDatabaseHandler.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommonAPIWrapper.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmNodeStateCommunicatorCAPI.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmRouter.cpp" - "*.cpp" - ${COMMON_API_GEN_SOURCES} - ) - -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in ${CMAKE_BINARY_DIR}/AmNodeStateCommunicatorCAPITest_dbus.conf) - -ADD_EXECUTABLE(AmNodeStateCommunicatorCAPITest ${NODESTATECOMMUNICATORCAPI} ${COMMON_API_GEN_SOURCES}) +file(GLOB NODESTATECOMMUNICATORCAPI_SRCS_CXX + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmNodeStateCommunicatorCAPI.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommonAPIWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "../CAmCommonFunctions.cpp" + "*.cpp") + +ADD_EXECUTABLE(AmNodeStateCommunicatorCAPITest ${NODESTATECOMMUNICATORCAPI_SRCS_CXX} ${COMMON_API_GEN_SOURCES}) TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} ${COMMON_API_LIBRARIES} @@ -91,7 +86,7 @@ TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest ADD_DEPENDENCIES(AmNodeStateCommunicatorCAPITest gtest gmock) INSTALL(TARGETS AmNodeStateCommunicatorCAPITest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -100,20 +95,17 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml ${CMAKE_CURRENT_SOURCE_DIR}/nsm.py ${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -IF(USE_BUILD_LIBS) +if(USE_BUILD_LIBS) execute_process( COMMAND mkdir -p ${EXECUTABLE_OUTPUT_PATH} COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml" ${EXECUTABLE_OUTPUT_PATH}/org.genivi.NodeStateManager.Consumer.xml COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/nsm.py" ${EXECUTABLE_OUTPUT_PATH}/nsm.py COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py" ${EXECUTABLE_OUTPUT_PATH}/send2nsm.py - COMMAND cp "${CMAKE_BINARY_DIR}/AmNodeStateCommunicatorCAPITest_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}) -ENDIF(USE_BUILD_LIBS) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "gtest" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + COMMAND cp "${AUDIOMANAGER_DAEMON_FOLDER}/fidls/NodeStateManager_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}/AmNodeStateCommunicatorCAPITest_dbus.conf) +endif(USE_BUILD_LIBS) diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp index 09e5f2b..df42fc1 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp @@ -20,9 +20,9 @@ */ #include "CAmNodeStateCommunicatorTest.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" -#include "shared/CAmDbusWrapper.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" +#include "CAmDbusWrapper.h" #include <unistd.h> diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt index 242aff4..29e0e4e 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt @@ -15,70 +15,63 @@ # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmNodeStateCommunicatorDBusTest) +project(AmNodeStateCommunicatorDBusTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1") -set(STD_INCLUDE_DIRS "/usr/include") -set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) - -FIND_PACKAGE(Threads) -FIND_PACKAGE(DBUS REQUIRED) -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) - pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) +find_package(Threads) +find_package(CommonAPI REQUIRED) +find_package(PythonLibs REQUIRED) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) +if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( - ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} - ${INCLUDE_FOLDER} ${PYTHON_INCLUDE_DIRS} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} - "../../include" + ${DBUS_ARCH_INCLUDE_DIR} + ${DBUS_INCLUDE_FOLDER} ) - + file(GLOB NODESTATECOMMUNICATOR - "../../src/CAmDatabaseHandler.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmNodeStateCommunicatorDBus.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmRouter.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmNodeStateCommunicatorDBus.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "../CAmCommonFunctions.cpp" "*.cpp" ) ADD_EXECUTABLE(AmNodeStateCommunicatorDBusTest ${NODESTATECOMMUNICATOR}) -TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorDBusTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} + ${COMMON_API_LIBRARIES} + ${COMMON_API_DBUS_LIBRARIES} gtest gmock ) @@ -86,7 +79,7 @@ TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorDBusTest ADD_DEPENDENCIES(AmNodeStateCommunicatorDBusTest gtest gmock) INSTALL(TARGETS AmNodeStateCommunicatorDBusTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -95,7 +88,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml ${CMAKE_CURRENT_SOURCE_DIR}/nsm.py ${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -108,6 +101,3 @@ IF(USE_BUILD_LIBS) COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py" ${EXECUTABLE_OUTPUT_PATH}/send2nsm.py) ENDIF(USE_BUILD_LIBS) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "gtest" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp index a6680e5..6481a59 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -20,7 +20,7 @@ #include "CAmRouterMapTest.h" #include <string.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h index 19bccfe..5b86e1a 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h @@ -36,7 +36,7 @@ #include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "../IAmControlBackdoor.h" #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt index 2209f40..e870e20 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt @@ -10,80 +10,65 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRouterMapTest) +project (AmRouterMapTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTINGMAP_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmRouterMapTest ${ROUTINGMAP_SRCS_CXX}) -TARGET_LINK_LIBRARIES( AmRouterMapTest - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmRouterMapTest + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRouterMapTest gtest gmock) INSTALL(TARGETS AmRouterMapTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp index f6f523f..dc6871a 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp @@ -20,7 +20,7 @@ #include "CAmRouterTest.h" #include <string.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h index ee66bf3..fd0c15a 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h @@ -36,7 +36,7 @@ #include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "../IAmControlBackdoor.h" #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 7a7b890..b19f6f1 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -7,84 +7,68 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRouterTest) +project(AmRouterTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTING_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) -TARGET_LINK_LIBRARIES( AmRouterTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmRouterTest + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRouterTest gtest gmock) INSTALL(TARGETS AmRouterTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index ea94f7b..9eca986 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -12,14 +12,14 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * */ #include "CAmRoutingInterfaceTest.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h index c354f75..ec30bfb 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -36,7 +36,7 @@ #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" #include "../MockIAmRoutingSend.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index b9aa9c5..6294f7d 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -10,84 +10,74 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRoutingInterfaceTest) +project (AmRoutingInterfaceTest) -#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +find_package(PkgConfig) -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB ROUTING_INTERFACE_SRCS_CXX - "../../src/CAmControlReceiver.cpp" - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmControlSender.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock) INSTALL(TARGETS AmRoutingInterfaceTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - - - diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp index d357d80..1b28326 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -28,7 +28,7 @@ #include <fcntl.h> #include <sys/un.h> #include <sys/poll.h> -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" //todo: expand test, implement more usecases //todo: test removeFD diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h index 3866fa8..aea5fb1 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -21,9 +21,11 @@ #ifndef SOCKETHANDLERTEST_H_ #define SOCKETHANDLERTEST_H_ +#define WITH_DLT + #include "gtest/gtest.h" #include <queue> -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index 1d02636..8cd4197 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -10,71 +10,64 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmSocketHandlerTest) +project(AmSocketHandlerTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -set(STD_INCLUDE_DIRS "/usr/include") -set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) -set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) -set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) - -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} + ${AUDIOMANAGER_UTILITIES_INCLUDE} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB Socket_SRCS_CXX - "../../src/CAmSocketHandler.cpp" - "../../src/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "*.cpp" ) ADD_EXECUTABLE(AmSocketHandlerTest ${Socket_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmSocketHandlerTest - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} + ${AM_LINK_LIBS} gtest - gmock - rt -) + gmock) ADD_DEPENDENCIES(AmSocketHandlerTest gtest gmock) INSTALL(TARGETS AmSocketHandlerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index e940423..1d677ad 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * For further information see http://www.genivi.org/. @@ -57,7 +57,6 @@ CAmEnvironment::CAmEnvironment() , mDatabasehandler() , mRoutingSender(mlistRoutingPluginDirs) , mCommandSender(mlistRoutingPluginDirs) -, mControlSender(controllerPlugin,&mSocketHandler) , mRouter(&mDatabasehandler,&mControlSender) , mpCommandReceiver(NULL) , mpRoutingReceiver(NULL) @@ -102,12 +101,12 @@ void CAmEnvironment::setSocketHandler(CAmSocketHandler* pSocketHandler) mpControlReceiver = new CAmControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,&mRouter); //startup all the Plugins and Interfaces - mControlSender.startupController(mpControlReceiver); - mCommandSender.startupInterfaces(mpCommandReceiver); - mRoutingSender.startupInterfaces(mpRoutingReceiver); + //mControlSender.startupController(mpControlReceiver); + //mCommandSender.startupInterfaces(mpCommandReceiver); + //mRoutingSender.startupInterfaces(mpRoutingReceiver); //when the routingInterface is done, all plugins are loaded: - mControlSender.setControllerReady(); + //mControlSender.setControllerReady(); // Starting TelnetServer mpTelnetServer = new CAmTelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,&mControlSender,mpControlReceiver,&mDatabasehandler,&mRouter,servPort,3); diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index 6f4ab6a..2be89f5 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * For further information see http://www.genivi.org/. @@ -29,11 +29,7 @@ #include "CAmControlSender.h" #include "CAmRouter.h" #include "config.h" -#ifdef WITH_DATABASE_STORAGE - #include "CAmDatabaseHandlerSQLite.h" -#else - #include "CAmDatabaseHandlerMap.h" -#endif +#include "CAmDatabaseHandlerMap.h" @@ -72,11 +68,7 @@ class CAmEnvironment : public ::testing::Environment std::vector<std::string> mlistCommandPluginDirs; CAmSocketHandler mSocketHandler; -#ifdef WITH_DATABASE_STORAGE - CAmDatabaseHandlerSQLite mDatabasehandler; -#else CAmDatabaseHandlerMap mDatabasehandler; -#endif CAmRoutingSender mRoutingSender; CAmCommandSender mCommandSender; CAmControlSender mControlSender; diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index 1dfa5c1..d613ed6 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -10,95 +10,74 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) PROJECT(AmTelnetServerTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -set(STD_INCLUDE_DIRS "/usr/include") -set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) -set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) -set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -FIND_PACKAGE(PkgConfig) -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) +INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB TELNET_SRCS_CXX - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmTelnetServer.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmTelnetMenuHelper.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetServer.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetMenuHelper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" "*.cpp" ) -IF(WITH_DATABASE_STORAGE) - SET (TELNET_SRCS_CXX ${TELNET_SRCS_CXX} "../../src/CAmDatabaseHandlerSQLite.cpp") -ELSE(WITH_DATABASE_STORAGE) - SET (TELNET_SRCS_CXX ${TELNET_SRCS_CXX} "../../src/CAmDatabaseHandlerMap.cpp") -ENDIF(WITH_DATABASE_STORAGE) - -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmTelnetServerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmTelnetServerTest gtest gmock) INSTALL(TARGETS AmTelnetServerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index 5ab6aef..34012be 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index ba152c3..1b25434 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/CMakeLists.txt b/AudioManagerDaemon/test/CMakeLists.txt index e0ae651..dceb22c 100644 --- a/AudioManagerDaemon/test/CMakeLists.txt +++ b/AudioManagerDaemon/test/CMakeLists.txt @@ -10,12 +10,12 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) diff --git a/AudioManagerDaemon/test/IAmCommandBackdoor.h b/AudioManagerDaemon/test/IAmCommandBackdoor.h index 5a01c06..33aef19 100644 --- a/AudioManagerDaemon/test/IAmCommandBackdoor.h +++ b/AudioManagerDaemon/test/IAmCommandBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/IAmControlBackdoor.h b/AudioManagerDaemon/test/IAmControlBackdoor.h index 3a1edef..1c006f0 100644 --- a/AudioManagerDaemon/test/IAmControlBackdoor.h +++ b/AudioManagerDaemon/test/IAmControlBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/IAmRoutingBackdoor.h b/AudioManagerDaemon/test/IAmRoutingBackdoor.h index 31cfded..f8bda2b 100644 --- a/AudioManagerDaemon/test/IAmRoutingBackdoor.h +++ b/AudioManagerDaemon/test/IAmRoutingBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h index 381f323..8d1c17f 100644 --- a/AudioManagerDaemon/test/MockIAmCommandSend.h +++ b/AudioManagerDaemon/test/MockIAmCommandSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index dc9bdc0..219a7f1 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h index 6ebb94d..f995828 100644 --- a/AudioManagerDaemon/test/MockIAmRoutingSend.h +++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * |