diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-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/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp')
| -rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 6b61816..1881955 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -2077,7 +2077,7 @@ TEST_F(CAmDatabaseHandlerTest,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; @@ -2112,7 +2112,7 @@ TEST_F(CAmDatabaseHandlerTest,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; @@ -2147,12 +2147,12 @@ TEST_F(CAmDatabaseHandlerTest,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; @@ -2197,12 +2197,12 @@ TEST_F(CAmDatabaseHandlerTest,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; |