summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/test/AmMapHandlerTest
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2014-06-11 18:14:58 +0200
committerChristian Linke <christian.linke@bmw.de>2014-06-23 14:05:37 +0200
commit20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch)
tree5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/test/AmMapHandlerTest
parentb0bc6ede2d23dde9a177483aa9470871422fe9aa (diff)
downloadaudiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/test/AmMapHandlerTest')
-rw-r--r--AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
index ae05960..25c61cc 100644
--- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
@@ -2092,7 +2092,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2127,7 +2127,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2162,12 +2162,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=10;
@@ -2215,12 +2215,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=27;
@@ -2524,7 +2524,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSource)
})!=listSources.end();
ASSERT_TRUE(containsSourceID);
std::vector<am_SoundProperty_s> listSoundProperties;
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
+ std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sourceUpdated(sourceID, _, _, _)).Times(1);
ASSERT_EQ(E_OK,pDatabaseHandler.changeSourceDB(sourceID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2570,7 +2570,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSink)
})!=listSinks.end();
ASSERT_TRUE(containsSourceID);
std::vector<am_SoundProperty_s> listSoundProperties;
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
+ std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sinkUpdated(sinkID, _, _, _)).Times(1);
ASSERT_EQ(E_OK,pDatabaseHandler.changeSinkDB(sinkID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2858,12 +2858,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=27;
@@ -2896,12 +2896,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=10;