From daf851ee7a41d1b0572c0c95e15f61e427ce97f1 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Tue, 8 Mar 2016 06:38:33 -0800 Subject: some cleanup Signed-off-by: Christian Linke --- .../test/AmControlInterfaceTest/CMakeLists.txt | 6 +- .../test/AmControlInterfaceTest/CMakeLists.txt~ | 50 ------ .../test/AmMapHandlerTest/CMakeLists.txt | 2 + .../test/AmMapHandlerTest/CMakeLists.txt~ | 54 ------ .../test/AmRouterMapTest/CMakeLists.txt | 2 + AudioManagerCore/test/AmRouterTest/CMakeLists.txt | 2 + .../test/AmRoutingInterfaceTest/CMakeLists.txt | 2 + .../test/AmTelnetServerTest/CMakeLists.txt | 2 +- .../test/AmTelnetServerTest/CMakeLists.txt~ | 46 ----- AudioManagerUtilities/include/CAmDltWrapper.h | 193 +++++++++++++++++++-- .../test/AmSocketHandlerTest/CMakeLists.txt | 2 +- 11 files changed, 194 insertions(+), 167 deletions(-) delete mode 100644 AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ delete mode 100644 AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ delete mode 100644 AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt index 4f33ac5..7660bbf 100644 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt @@ -33,9 +33,9 @@ INCLUDE_DIRECTORIES( add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore + ${GTEST_LIBRARIES} + ${GMOCK_LIBRARIES} + AudioManagerCore ) add_test(AmControlInterfaceTest AmControlInterfaceTest) diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ deleted file mode 100644 index 5b71a59..0000000 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# 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 -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmControlInterfaceTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIRS}) - - - file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" -) - -add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmControlInterfaceTest AudioManagerCore) - -INSTALL(TARGETS AmControlInterfaceTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests) - - - - diff --git a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt index 6588710..41c62c7 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt @@ -39,6 +39,8 @@ TARGET_LINK_LIBRARIES( AmMapHandlerTest AudioManagerCore ) +ADD_TEST(AmMapHandlerTest AmMapHandlerTest) + ADD_DEPENDENCIES(AmMapHandlerTest AudioManagerCore) INSTALL(TARGETS AmMapHandlerTest diff --git a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ deleted file mode 100644 index 05d2a05..0000000 --- a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# 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 -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmMapHandlerTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${GMOCK_INCLUDE_DIRS} -) - -if(WITH_DLT) - INCLUDE_DIRECTORIES( - ${INCLUDE_DIRECTORIES} - ${DLT_INCLUDE_DIRS}) -endif(WITH_DLT) - -file(GLOB DATABASE_SRCS_CXX - "../CAmCommonFunctions.cpp" - "CAmTestDatabaseObserver.cpp" - "*.cpp" - ) - -ADD_EXECUTABLE( AmMapHandlerTest ${DATABASE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES( AmMapHandlerTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmMapHandlerTest AudioManagerCore) - -INSTALL(TARGETS AmMapHandlerTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - diff --git a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt index 17689d9..dc2732c 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt @@ -37,6 +37,8 @@ TARGET_LINK_LIBRARIES(AmRouterMapTest AudioManagerCore ) +ADD_TEST(AmRouterMapTest AmRouterMapTest) + ADD_DEPENDENCIES(AmRouterMapTest AudioManagerCore) INSTALL(TARGETS AmRouterMapTest diff --git a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt index d1c0635..89094c8 100644 --- a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt @@ -40,6 +40,8 @@ TARGET_LINK_LIBRARIES(AmRouterTest ADD_DEPENDENCIES(AmRouterTest AudioManagerCore) +ADD_TEST(AmRouterTest AmRouterTest) + INSTALL(TARGETS AmRouterTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ diff --git a/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt index dc5115d..6d47c15 100644 --- a/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -33,6 +33,8 @@ file(GLOB ROUTING_INTERFACE_SRCS_CXX ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX}) +ADD_TEST(AmRoutingInterfaceTest AmRoutingInterfaceTest) + TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} diff --git a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt index 8dcb0a3..746edb5 100644 --- a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt @@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(AmTelnetServerTest ${GMOCK_LIBRARIES} AudioManagerCore ) -add_test(AmTelnetServerTest AmTelnetServerTest) +#add_test(AmTelnetServerTest AmTelnetServerTest) ADD_DEPENDENCIES(AmTelnetServerTest AudioManagerCore) diff --git a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ deleted file mode 100644 index 51e92b8..0000000 --- a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# 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 -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -PROJECT(AmTelnetServerTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIR}) - -file(GLOB TELNET_SRCS_CXX - "*.cpp" -) - -ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmTelnetServerTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmTelnetServerTest AudioManagerCore) - -INSTALL(TARGETS AmTelnetServerTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - - diff --git a/AudioManagerUtilities/include/CAmDltWrapper.h b/AudioManagerUtilities/include/CAmDltWrapper.h index 009b1e6..4a00f6f 100644 --- a/AudioManagerUtilities/include/CAmDltWrapper.h +++ b/AudioManagerUtilities/include/CAmDltWrapper.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "audiomanagertypes.h" @@ -197,22 +198,190 @@ public: // specialization for const am_Error_e template void append(const am_Error_e value) { - const char* str_error[E_MAX] = { - "E_OK", - "E_UNKNOWN", - "E_OUT_OF_RANGE", - "E_NOT_USED", - "E_DATABASE_ERROR", - "E_ALREADY_EXISTS", - "E_NO_CHANGE", - "E_NOT_POSSIBLE", - "E_NON_EXISTENT", - "E_ABORTED", - "E_WRONG_FORMAT" + const std::vector str_error = { + "E_OK", + "E_UNKNOWN", + "E_OUT_OF_RANGE", + "E_NOT_USED", + "E_DATABASE_ERROR", + "E_ALREADY_EXISTS", + "E_NO_CHANGE", + "E_NOT_POSSIBLE", + "E_NON_EXISTENT", + "E_ABORTED", + "E_WRONG_FORMAT", + "E_COMMUNICATION", + "E_MAX" }; + if ((int)value >=str_error.size()) + { + append("value for am_Error_e out of bounds!"); + append(value); + return; + } append(str_error[value]); } + // specialization for const am_Error_e + template void append(const am_SourceState_e value) + { + const std::vector str_sourceState = { + "SS_UNKNNOWN", + "SS_ON", + "SS_OFF", + "SS_PAUSED", + "SS_MAX" + }; + if ((int)value >=(str_sourceState.size())) + { + append("value for am_SourceState_e out of bounds!"); + append(value); + return; + } + append(str_sourceState[value]); + } + + + template void append(const am_MuteState_e value) + { + const std::vector str_MuteState= { + "MS_UNKNOWN" , + "MS_MUTED" , + "MS_UNMUTED" , + "MS_MAX" + }; + if ((int)value >=str_MuteState.size()) + { + append("value for am_MuteState_e out of bounds!"); + append(value); + return; + } + append(str_MuteState[value]); + } + + template void append(const am_DomainState_e value) + { + const std::vector str_DomainState = { + "DS_UNKNOWN", + "DS_CONTROLLED", + "DS_INDEPENDENT_STARTUP", + "DS_INDEPENDENT_RUNDOWN", + "DS_MAX" + }; + if ((int)value >= str_DomainState.size()) + { + append("value for am_DomainState_e out of bounds!"); + append(value); + return; + } + append(str_DomainState[value]); + } + + template void append(const am_ConnectionState_e value) + { + const std::vector str_ConnectionState = { + "CS_UNKNOWN", + "CS_CONNECTING", + "CS_CONNECTED", + "CS_DISCONNECTING", + "CS_DISCONNECTED", + "CS_SUSPENDED", + "CS_MAX" + }; + if ((int)value >=str_ConnectionState.size()) + { + append("value for am_ConnectionState_e out of bounds!"); + append(value); + return; + } + append(str_ConnectionState[value]); + } + + template void append(const am_Availability_e value) + { + const std::vector str_Availability = { + "A_UNKNOWN", + "A_AVAILABLE", + "A_UNAVAILABLE", + "A_MAX" + }; + if ((int)value >= str_Availability.size()) + { + append("value for am_Availability_e out of bounds!"); + append(value); + return; + } + append(str_Availability[value]); + } + + template void append(const am_InterruptState_e value) + { + const std::vector str_Interrupt = { + "IS_UNKNOWN", + "IS_OFF", + "IS_INTERRUPTED", + "IS_MAX" + }; + if ((int)value >=str_Interrupt.size()) + { + append("value for am_InterruptState_e out of bounds!"); + append(value); + return; + } + append(str_Interrupt[value]); + } + + template void append(const am_Handle_e value) + { + const std::vector str_Handle = { + "H_UNKNOWN", + "H_CONNECT", + "H_DISCONNECT", + "H_SETSOURCESTATE", + "H_SETSINKVOLUME", + "H_SETSOURCEVOLUME", + "H_SETSINKSOUNDPROPERTY", + "H_SETSOURCESOUNDPROPERTY", + "H_SETSINKSOUNDPROPERTIES", + "H_SETSOURCESOUNDPROPERTIES", + "H_CROSSFADE", + "H_SETVOLUMES", + "H_SETSINKNOTIFICATION", + "H_SETSOURCENOTIFICATION", + "H_MAX" + }; + if ((int)value >=str_Handle.size()) + { + append("value for am_Handle_e out of bounds!"); + append(value); + return; + } + append(str_Handle[value]); + } + + template void append(const am_NotificationStatus_e value) + { + const std::vector str_NotificationStatus = { + "NS_UNKNOWN", + "NS_OFF", + "NS_PERIODIC", + "NS_MINIMUM", + "NS_MAXIMUM", + "NS_CHANGE", + "NS_MAX" + }; + if ((int)value >=str_NotificationStatus.size()) + { + append("value for am_NotificationStatus_e out of bounds!"); + append(value); + return; + } + append(str_NotificationStatus[value]); + } + + + + // Template to print unknown pointer types with their address template void append(T* value) { diff --git a/AudioManagerUtilities/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerUtilities/test/AmSocketHandlerTest/CMakeLists.txt index 012aa73..8f0c9e6 100644 --- a/AudioManagerUtilities/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerUtilities/test/AmSocketHandlerTest/CMakeLists.txt @@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(AmSocketHandlerTest AudioManagerUtilities ) -ADD_TEST(AmSocketHandlerTest AmSocketHandlerTest ${Socket_SRCS_CXX}) +#ADD_TEST(AmSocketHandlerTest AmSocketHandlerTest ${Socket_SRCS_CXX}) ADD_DEPENDENCIES(AmSocketHandlerTest AudioManagerUtilities) -- cgit v1.2.1