* Fix for the unit tests in accord with the domain id change .

Signed-off-by: Christian Linke <christian.linke@bmw.de>

2 files changed, 21 insertions, 21 deletions

diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index af141b7..ffc493a 100644
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -172,7 +172,7 @@ TEST_F(CAmControlInterfaceTest,ackConnect)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
 
     //prepare the stage
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
@@ -228,7 +228,7 @@ TEST_F(CAmControlInterfaceTest,ackDisconnect)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
 
     //prepare the stage
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
@@ -282,7 +282,7 @@ TEST_F(CAmControlInterfaceTest,ackDisconnectFailAndRetry)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
 
     //prepare the stage
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
@@ -339,7 +339,7 @@ TEST_F(CAmControlInterfaceTest,setSourceState)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
 
     //prepare the stage
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
@@ -389,7 +389,7 @@ TEST_F(CAmControlInterfaceTest,SetSinkVolumeChange)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     sink.volume = 10;
 
     //setup environment, we need a domain and a sink
@@ -440,7 +440,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceVolumeChange)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     source.volume = 12;
 
     //prepare the scene
@@ -492,7 +492,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     soundProperty.type = SP_GENIVI_BASS;
     soundProperty.value = 244;
 
@@ -545,7 +545,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     soundProperty.type = SP_GENIVI_BASS;
     soundProperty.value = 244;
 
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
index 0b6d97a..a557564 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
@@ -75,7 +75,7 @@ TEST_F(CAmRoutingInterfaceTest,abort)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
 
     //prepare the stage
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
@@ -123,7 +123,7 @@ TEST_F(CAmRoutingInterfaceTest,alreadyConnected)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
@@ -152,7 +152,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     sink.listSoundProperties.push_back(soundProperty);
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
@@ -173,7 +173,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceState)
     pCF.createDomain(domain);
     domain.name = "mock";
     domain.busname = "mock";
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     EXPECT_CALL(pMockInterface,asyncSetSourceState(_,sourceID,state)).WillOnce(Return(E_OK));
@@ -196,7 +196,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceSoundProperty)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     EXPECT_CALL(pMockInterface,asyncSetSourceSoundProperty(_,sourceID,_)).WillOnce(Return(E_OK));
@@ -224,7 +224,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     sink.listSoundProperties.push_back(soundProperty);
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
@@ -254,7 +254,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     source.volume = volume;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
@@ -280,7 +280,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolume)
     domain.name = "mock";
     domain.busname = "mock";
     source.sourceID = 2;
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     EXPECT_CALL(pMockInterface,asyncSetSourceVolume(_,2,volume,rampType,rampTime)).WillOnce(Return(E_OK));
@@ -308,7 +308,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     sink.volume = volume;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
@@ -334,7 +334,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolume)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     EXPECT_CALL(pMockInterface,asyncSetSinkVolume(_,2,volume,rampType,rampTime)).WillOnce(Return(E_OK));
@@ -360,7 +360,7 @@ TEST_F(CAmRoutingInterfaceTest,connect)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
@@ -386,7 +386,7 @@ TEST_F(CAmRoutingInterfaceTest,disconnect)
     domain.name = "mock";
     domain.busname = "mock";
     sink.sinkID = 2;
-    sink.domainID = 1;
+    sink.domainID = DYNAMIC_ID_BOUNDARY;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
@@ -425,7 +425,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceStateNoChange)
     pCF.createDomain(domain);
     domain.name = "mock";
     domain.busname = "mock";
-    source.domainID = 1;
+    source.domainID = DYNAMIC_ID_BOUNDARY;
     source.sourceState = state;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));