summaryrefslogtreecommitdiff
path: root/PluginRoutingInterfaceAsync
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-03-05 13:55:09 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-03-05 13:55:09 +0100
commit1b85f2410d1d644ff00284e78b1eeff6cfad2fc4 (patch)
tree2031d9cd7356aee5599fdb4cdc8c79df209b36b8 /PluginRoutingInterfaceAsync
parent71a2207933a73da2708a483b78feb511bec35abd (diff)
downloadaudiomanager-1b85f2410d1d644ff00284e78b1eeff6cfad2fc4.tar.gz
* fixing CAmSerializer.h - smaller changes and copy past stuff
* adding new class in Controler plugin to use CAmSerializer to build up a shadow * added test to test the new class (unfinished)
Diffstat (limited to 'PluginRoutingInterfaceAsync')
-rw-r--r--PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h2
-rw-r--r--PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp1
-rw-r--r--PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp1
-rw-r--r--PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h1
-rw-r--r--PluginRoutingInterfaceAsync/test/CMakeLists.txt2
5 files changed, 2 insertions, 5 deletions
diff --git a/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h b/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h
index af4685c..cfce5a1 100644
--- a/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h
+++ b/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h
@@ -26,8 +26,6 @@
#define ROUTINGRECEIVERASYNCSHADOW_H_
#include "routing/IAmRoutingReceive.h"
-#include <pthread.h>
-#include <queue>
#include "shared/CAmSerializer.h"
#include "shared/CAmSocketHandler.h"
diff --git a/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp
index b8733db..c894954 100644
--- a/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp
+++ b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp
@@ -33,6 +33,7 @@
#include <errno.h>
#include <string>
#include "shared/CAmDltWrapper.h"
+#include "shared/CAmSerializer.h"
using namespace am;
diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
index 2d3cbca..1c2c7a9 100644
--- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
@@ -28,6 +28,7 @@
#include "TAmPluginTemplate.h"
#include "MockIAmRoutingReceive.h"
#include "shared/CAmDltWrapper.h"
+#include "routing/IAmRoutingSend.h"
using namespace am;
using namespace testing;
diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
index ec33c9f..e8aab64 100644
--- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
@@ -31,7 +31,6 @@
#include "MockIAmRoutingReceive.h"
#include "shared/CAmSocketHandler.h"
#include "shared/CAmSerializer.h"
-#include "../../AudioManagerDaemon/include/CAmRoutingSender.h"
#define UNIT_TEST 1
diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
index 59c50dc..cf537bd 100644
--- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
@@ -25,8 +25,6 @@ cmake_minimum_required(VERSION 2.6)
PROJECT(AmRoutingReceiverAsync)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
-
set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
FIND_PACKAGE(GTest REQUIRED)