diff options
Diffstat (limited to 'AudioManagerDaemon/test/AmControlInterfaceTest')
3 files changed, 48 insertions, 57 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) |