summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2013-01-18 12:12:32 +0100
committerChristian Linke <christian.linke@bmw.de>2013-01-18 13:23:14 +0100
commit573d543d61bafd1499dd1c5e372cbdaf4dfb2a7f (patch)
treede2c83227124f42942b27e3418c4d77fc905c8ed
parentfe07befd3a2d2cbefc631fdfe7050ef0f429a042 (diff)
downloadaudiomanager-573d543d61bafd1499dd1c5e372cbdaf4dfb2a7f.tar.gz
* fix asyncRoutingTest and NSM test
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp8
-rw-r--r--PluginRoutingInterfaceAsync/test/CMakeLists.txt1
2 files changed, 4 insertions, 5 deletions
diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
index ad88143..b19883e 100644
--- a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
+++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
@@ -155,12 +155,12 @@ TEST_F(CAmNodeStateCommunicatorTest, receiveLifecycleRequest)
env->pControlInterfaceBackdoor.replaceController(&env->pControlSender,&pMockControlInterface);
uint32_t shutdownmode(1);
uint32_t timeoutMs(100);
- uint32_t Request(1);
- uint32_t RequestID(4);
- EXPECT_CALL(pMockControlInterface,hookSystemLifecycleRequest(Request,RequestID)).WillOnce(Return(NsmErrorStatus_e::NsmErrorStatus_Ok));
+ int32_t Request=(1);
+ int32_t RequestID(4);
+ EXPECT_CALL(pMockControlInterface,hookSystemLifecycleRequest(1,RequestID)).WillOnce(Return(NsmErrorStatus_e::NsmErrorStatus_Ok));
ASSERT_EQ(NsmErrorStatus_e::NsmErrorStatus_Ok,env->nsmController.nsmRegisterShutdownClient(shutdownmode,timeoutMs));
std::ostringstream send;
- send << "python send2nsm.py LifecycleRequest "<<static_cast<std::int32_t>(Request)<<" "<<static_cast<int32_t>(RequestID);
+ send << "python send2nsm.py LifecycleRequest "<<Request<<" "<<RequestID;
system(send.str().c_str());
}
diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
index a8ca55c..ad67048 100644
--- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
@@ -20,7 +20,6 @@ cmake_minimum_required(VERSION 2.6)
PROJECT(AmRoutingReceiverAsync)
set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
-set(GOOGLE_TEST_INCLUDE_DIR "googleTest/include")
FIND_PACKAGE(Threads)
FIND_PACKAGE(PkgConfig)