From 0ecee9b12bea7481d56ae9aa3291272dfe4d22e7 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Mon, 11 Apr 2016 07:21:57 -0700 Subject: Remove assert from database and replace by error handling Signed-off-by: Christian Linke --- .../test/AmRouterTest/CAmRouterTest.cpp | 15 +++++++ AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ | 47 ---------------------- 2 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ (limited to 'AudioManagerCore/test/AmRouterTest') diff --git a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp index 5f59777..28a5a72 100644 --- a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp @@ -60,6 +60,21 @@ CAmRouterTest::~CAmRouterTest() void CAmRouterTest::SetUp() { logInfo("Routing Test started "); + am_Domain_s domain; + pCF.createDomain(domain); + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=5; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=5; + domain.domainID=4; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); } void CAmRouterTest::TearDown() diff --git a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ deleted file mode 100644 index 32e1206..0000000 --- a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ +++ /dev/null @@ -1,47 +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(AmRouterTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIR}) - - -file(GLOB ROUTING_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" - ) - -ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmRouterTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmRouterTest AudioManagerCore) - -INSTALL(TARGETS AmRouterTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - -- cgit v1.2.1