diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-04-11 07:21:57 -0700 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-04-11 07:21:57 -0700 |
commit | 0ecee9b12bea7481d56ae9aa3291272dfe4d22e7 (patch) | |
tree | 08d230527ef71757602f3ce47b0204bb7dd8a9cf /AudioManagerCore/test | |
parent | daf851ee7a41d1b0572c0c95e15f61e427ce97f1 (diff) | |
download | audiomanager-0ecee9b12bea7481d56ae9aa3291272dfe4d22e7.tar.gz |
Remove assert from database and replace by error handling
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'AudioManagerCore/test')
8 files changed, 576 insertions, 150 deletions
diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index 0836229..be2203a 100644 --- a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -77,6 +77,24 @@ CAmControlInterfaceTest::~CAmControlInterfaceTest() void CAmControlInterfaceTest::SetUp() { + ::testing::FLAGS_gmock_verbose = "error"; + + am_Domain_s domain; + pCF.createDomain(domain); + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=1; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=1; + domain.domainID=4; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); + } void CAmControlInterfaceTest::TearDown() @@ -173,6 +191,8 @@ TEST_F(CAmControlInterfaceTest,ackConnect) am_connectionID_t connectionID; am_Sink_s sink; am_sinkID_t sinkID; + am_Source_s source; + am_sourceID_t sourceID; am_Domain_s domain; am_domainID_t domainID; std::vector<am_Connection_s> connectionList; @@ -180,14 +200,16 @@ TEST_F(CAmControlInterfaceTest,ackConnect) am_Handle_s handle; pCF.createSink(sink); pCF.createDomain(domain); + pCF.createSource(source); domain.name = "mock"; domain.busname = "mock"; sink.sinkID = 2; - sink.domainID = DYNAMIC_ID_BOUNDARY; + source.sourceID=2; //prepare the stage ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); //when asyncConnect is called, we expect a call on the routingInterface EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK)); @@ -231,19 +253,25 @@ TEST_F(CAmControlInterfaceTest,ackDisconnect) am_sinkID_t sinkID; am_Domain_s domain; am_domainID_t domainID; + am_Source_s source; + am_sourceID_t sourceID; std::vector<am_Connection_s> connectionList; std::vector<am_Handle_s> handlesList; am_Handle_s handle; pCF.createSink(sink); pCF.createDomain(domain); + pCF.createSource(source); + domain.domainID=0; domain.name = "mock"; domain.busname = "mock"; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; + source.sourceID=2; //prepare the stage ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); //now we first need to connect, we expect a call on the routing interface EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK)); @@ -285,19 +313,25 @@ TEST_F(CAmControlInterfaceTest,ackDisconnectFailAndRetry) am_sinkID_t sinkID; am_Domain_s domain; am_domainID_t domainID; + am_Source_s source; + am_sourceID_t sourceID; std::vector<am_Connection_s> connectionList; std::vector<am_Handle_s> handlesList; am_Handle_s handle; pCF.createSink(sink); pCF.createDomain(domain); + pCF.createSource(source); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; + source.sourceID=2; //prepare the stage ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); //now we first need to connect, we expect a call on the routing interface EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK)); @@ -349,6 +383,7 @@ TEST_F(CAmControlInterfaceTest,setSourceState) pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; source.sourceID = 2; source.domainID = DYNAMIC_ID_BOUNDARY; @@ -399,6 +434,7 @@ TEST_F(CAmControlInterfaceTest,SetSinkVolumeChange) pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; sink.volume = 10; @@ -450,6 +486,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceVolumeChange) pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; source.sourceID = 2; source.domainID = DYNAMIC_ID_BOUNDARY; source.volume = 12; @@ -502,6 +539,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; soundProperty.type = SP_GENIVI_BASS; @@ -555,6 +593,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; source.sourceID = 2; source.domainID = DYNAMIC_ID_BOUNDARY; soundProperty.type = SP_GENIVI_BASS; @@ -626,19 +665,26 @@ TEST_F(CAmControlInterfaceTest,ackConnectNotPossible) am_sinkID_t sinkID; am_Domain_s domain; am_domainID_t domainID; + am_Source_s source; + am_sourceClass_t sourceID; std::vector<am_Connection_s> connectionList; std::vector<am_Handle_s> handlesList; am_Handle_s handle; pCF.createSink(sink); pCF.createDomain(domain); + pCF.createSource(source); + domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; + source.sourceID=2; //prepare the stage ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); //when asyncConnect is called, we expect a call on the routingInterface EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_COMMUNICATION)); diff --git a/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp index dd61b7c..9557b6f 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp +++ b/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp @@ -72,6 +72,7 @@ void CAmMapBasicTest::createMainConnectionSetup(am_mainConnectionID_t & mainConn am_Connection_s connection; am_Source_s source; am_Sink_s sink; + am_Domain_s domain; std::vector<am_connectionID_t> connectionList; //we create 9 sources and sinks: @@ -85,11 +86,10 @@ void CAmMapBasicTest::createMainConnectionSetup(am_mainConnectionID_t & mainConn pCF.createSink(sink); sink.sinkID = i; sink.name = "sink" + int2string(i); - sink.domainID = 4; pCF.createSource(source); source.sourceID = i; source.name = "source" + int2string(i); - source.domainID = 4; + connection.sinkID = i; connection.sourceID = i; @@ -136,6 +136,22 @@ void CAmMapBasicTest::createMainConnectionSetup(am_mainConnectionID_t & mainConn void CAmMapBasicTest::SetUp() { ::testing::FLAGS_gmock_verbose = "error"; + + am_Domain_s domain; + pCF.createDomain(domain); + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=1; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=1; + domain.domainID=4; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); } void CAmMapBasicTest::TearDown() @@ -182,7 +198,7 @@ TEST_F(CAmMapHandlerTest,getSinkInfo) am_sinkID_t staticSinkID, firstDynamicSinkID, secondDynamicSinkID; std::vector<am_Sink_s> sinkList; - pCF.createSink(staticSink); + pCF.createSink(staticSink); staticSink.sinkID = 4; ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(staticSink,staticSinkID)) @@ -688,8 +704,20 @@ TEST_F(CAmMapHandlerTest,changeConnectionTimingInformation) { am_Connection_s connection; am_connectionID_t connectionID; + am_Source_s source; + am_Sink_s sink; + am_sourceID_t sourceid; + am_sinkID_t sinkid; std::vector<am_Connection_s> connectionList; pCF.createConnection(connection); + pCF.createSink(sink); + pCF.createSource(source); + + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink,sinkid)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source,sourceid)); + + connection.sinkID=sinkid; + connection.sourceID=sourceid; //enter a connection ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID)); @@ -723,12 +751,12 @@ TEST_F(CAmMapHandlerTest,getSinkClassOfSink) sink.sinkClassID = 4; //prepare test + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); //enter a new sinkclass, read out again and check - ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList)); ASSERT_EQ(sinkClassList[0].name, sinkClass.name); ASSERT_EQ(sinkClassList[0].sinkClassID, 4); @@ -756,17 +784,17 @@ TEST_F(CAmMapHandlerTest,getSourceClassOfSource) classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; - sourceClass.sourceClassID = 1; + sourceClass.sourceClassID = 8; sourceClass.listClassProperties = classPropertyList; pCF.createSource(source); + source.sourceClassID=8; - + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); - ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList)); ASSERT_EQ(sourceClassList[0].name, sourceClass.name); - ASSERT_EQ(sourceClassList[0].sourceClassID, 1); + ASSERT_EQ(sourceClassList[0].sourceClassID, source.sourceClassID); ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties)); ASSERT_EQ(E_OK, pDatabaseHandler.getSourceClassInfoDB(sourceID,sinkSourceClass)); ASSERT_EQ(sourceClassList[0].name, sinkSourceClass.name); @@ -798,6 +826,7 @@ TEST_F(CAmMapHandlerTest,removeSourceClass) ASSERT_EQ(sourceClassList[0].sourceClassID, 3); ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties)); ASSERT_EQ(E_OK, pDatabaseHandler.removeSourceClassDB(3)); + ASSERT_EQ(E_OK, pDatabaseHandler.removeSourceClassDB(1)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList)); ASSERT_TRUE(sourceClassList.empty()); } @@ -909,6 +938,7 @@ TEST_F(CAmMapHandlerTest,removeSinkClass) ASSERT_EQ(sinkClassList[0].sinkClassID, DYNAMIC_ID_BOUNDARY); ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties)); ASSERT_EQ(E_OK, pDatabaseHandler.removeSinkClassDB(sinkClassID)); + ASSERT_EQ(E_OK, pDatabaseHandler.removeSinkClassDB(1)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList)); ASSERT_TRUE(sinkClassList.empty()); } @@ -1235,7 +1265,7 @@ TEST_F(CAmMapHandlerTest, peekDomain) pCF.createDomain(domain); ASSERT_EQ(E_OK, pDatabaseHandler.peekDomain(std::string("newdomain"),domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains)); - ASSERT_TRUE(listDomains.empty()); + ASSERT_FALSE(listDomains.empty()); ASSERT_EQ(domainID, DYNAMIC_ID_BOUNDARY); domain.name = "newdomain"; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domain2ID)); @@ -1267,7 +1297,7 @@ TEST_F(CAmMapHandlerTest, changeDomainState) pCF.createDomain(domain); am_DomainState_e newState = DS_INDEPENDENT_STARTUP; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); - ASSERT_EQ(E_OK, pDatabaseHandler.changDomainStateDB(newState,domainID)); + ASSERT_EQ(E_OK, pDatabaseHandler.changeDomainStateDB(newState,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains)); ASSERT_EQ(newState, listDomains[0].state); } @@ -1486,7 +1516,7 @@ TEST_F(CAmMapHandlerTest,getVisibleMainConnections) TEST_F(CAmMapHandlerTest,getListSourcesOfDomain) { am_Source_s source, source2; - am_Domain_s domain; + am_Domain_s domain,domain1; am_domainID_t domainID; am_sourceID_t sourceID; std::vector<am_sourceID_t> sourceList, sourceCheckList; @@ -1497,8 +1527,10 @@ TEST_F(CAmMapHandlerTest,getListSourcesOfDomain) pCF.createSource(source2); source2.sourceID = 0; source2.name = "testSource2"; - source2.domainID = 5; + source2.domainID = 4; pCF.createDomain(domain); + domain.domainID=0; + domain.name="dynDomain"; sourceCheckList.push_back(1); //sink.sinkID); ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); @@ -1524,9 +1556,11 @@ TEST_F(CAmMapHandlerTest,getListSinksOfDomain) sink.sinkID = 1; sink.domainID = DYNAMIC_ID_BOUNDARY; pCF.createSink(sink2); - sink2.domainID = 5; + sink2.domainID = 4; sink2.name = "sink2"; pCF.createDomain(domain); + domain.domainID=0; + domain.name="dyndomain"; sinkCheckList.push_back(1); //sink.sinkID); ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); @@ -1546,20 +1580,48 @@ TEST_F(CAmMapHandlerTest,getListGatewaysOfDomain) am_Gateway_s gateway, gateway2; am_gatewayID_t gatewayID1, gatewayID2; am_domainID_t domainID; + am_sinkID_t sinkID; + am_sourceID_t sourceID; am_Domain_s domain; + am_Sink_s sink; + am_Source_s source; std::vector<am_gatewayID_t> gatewayList, gatewayCheckList; pCF.createDomain(domain); + domain.domainID=0; + domain.name="dyndomain"; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); + pCF.createSink(sink); + pCF.createSource(source); + source.sourceID=20; + sink.sinkID=30; + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source,sourceID)); + + am_Sink_s sink1; + am_Source_s source1; + am_sinkID_t sinkID1; + am_sourceID_t sourceID1; + pCF.createSink(sink1); + sink1.sinkID=32; + sink1.name="bla"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink1,sinkID1)); + sink.sinkID = sinkID1; + + pCF.createSource(source1); + source1.name="blubb"; + source1.sourceID=56; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source1,sourceID1)); + source.sourceID = sourceID1; pCF.createGateway(gateway); gateway.gatewayID = 1; gateway.name = "testGateway"; gateway.controlDomainID = domainID; - gateway.sourceID = 1; - gateway.sinkID = 1; - gateway.domainSinkID = 1; - gateway.domainSourceID = 1; + gateway.sourceID = source.sourceID; + gateway.sinkID = sink.sinkID; + gateway.domainSinkID = 4; + gateway.domainSourceID = 4; ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID1)) << "ERROR: database error"; ASSERT_EQ(true, gatewayID1==1); @@ -1568,26 +1630,15 @@ TEST_F(CAmMapHandlerTest,getListGatewaysOfDomain) gateway2.gatewayID = 2; gateway2.name = "testGateway2"; gateway2.controlDomainID = 4; - gateway2.sourceID = 1; - gateway2.sinkID = 1; - gateway2.domainSinkID = 1; - gateway2.domainSourceID = 1; + gateway2.sourceID = source1.sourceID; + gateway2.sinkID = sink1.sinkID; + gateway2.domainSinkID = 4; + gateway2.domainSourceID = 4; ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway2,gatewayID2)) << "ERROR: database error"; ASSERT_EQ(true, gatewayID2==2); gatewayCheckList.push_back(gatewayID1); - am_Sink_s sink; - am_Source_s source; - am_sinkID_t sinkID; - am_sourceID_t sourceID; - pCF.createSink(sink); - ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); - sink.sinkID = sinkID; - - pCF.createSource(source); - ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); - source.sourceID = sourceID; ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListGatewaysOfDomain(2,gatewayList)) << "ERROR: database error"; @@ -1606,24 +1657,37 @@ TEST_F(CAmMapHandlerTest,getListConvertersOfDomain) std::vector<am_converterID_t> converterList, converterCheckList; pCF.createDomain(domain); + domain.domainID=6; + domain.name="sdfsd"; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); + am_sinkID_t sinkID1; + am_sourceID_t sourceID1; + am_Sink_s sink1; + am_Source_s source1; + pCF.createSink(sink1); + pCF.createSource(source1); + source1.sourceID=20; + sink1.sinkID=30; + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink1,sinkID1)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source1,sourceID1)); + pCF.createConverter(converter); converter.converterID = 1; - converter.name = "testGateway"; - converter.sourceID = 1; - converter.sinkID = 1; - converter.domainID = domainID; + converter.name = "testConverter"; + converter.sourceID = 20; + converter.sinkID = 30; + converter.domainID = 4; ASSERT_EQ(E_OK,pDatabaseHandler.enterConverterDB(converter,converterID1)) << "ERROR: database error"; ASSERT_EQ(true, converterID1==1); pCF.createConverter(converter2); converter2.converterID = 2; - converter2.name = "testGateway2"; - converter2.domainID = 4; - converter2.sourceID = 1; - converter2.sinkID = 1; + converter2.name = "testConverter2"; + converter2.domainID = 6; + converter2.sourceID = 20; + converter2.sinkID = 30; ASSERT_EQ(E_OK,pDatabaseHandler.enterConverterDB(converter2,converterID2)) << "ERROR: database error"; ASSERT_EQ(true, converterID2==2); @@ -1634,17 +1698,21 @@ TEST_F(CAmMapHandlerTest,getListConvertersOfDomain) am_sinkID_t sinkID; am_sourceID_t sourceID; pCF.createSink(sink); + sink.sinkID=4; + sink.name="ere"; ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); sink.sinkID = sinkID; pCF.createSource(source); + source.sourceID=2; + source.name="ere2"; ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); source.sourceID = sourceID; - ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListConvertersOfDomain(4,converterList)) + ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListConvertersOfDomain(8,converterList)) << "ERROR: database error"; ASSERT_TRUE(converterList.empty()); - ASSERT_EQ(E_OK,pDatabaseHandler.getListConvertersOfDomain(domainID,converterList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListConvertersOfDomain(4,converterList)) << "ERROR: database error"; ASSERT_TRUE(std::equal(converterList.begin(),converterList.end(),converterCheckList.begin()) && !converterList.empty()); } @@ -1678,6 +1746,7 @@ TEST_F(CAmMapHandlerTest,removeGateway) pCF.createSource(source); sink.sinkID = 1; source.sourceID = 2; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID)) @@ -2143,8 +2212,21 @@ TEST_F(CAmMapHandlerTest,registerConnectionCorrect) std::vector<am_Connection_s> returnList; pCF.createConnection(connection); + am_Sink_s sink; + am_Source_s source; + am_sinkID_t sinkID; + am_sourceID_t sourceID; + pCF.createSink(sink); + sink.sinkID=connection.sinkID; + pCF.createSource(source); + source.sourceID=connection.sourceID; + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source,sourceID)); + + + ASSERT_EQ(E_OK,pDatabaseHandler.enterConnectionDB(connection,connectionID)) - << "ERROR: database error";; + << "ERROR: database error"; ASSERT_NE(0,connectionID) << "ERROR: connectionID zero"; @@ -2508,13 +2590,16 @@ TEST_F(CAmMapHandlerTest, peekDomain_2) am_domainID_t domainID; am_domainID_t domain2ID; pCF.createDomain(domain); + am_Domain_s domain2; + pCF.createDomain(domain2); + domain2.domainID=0; ASSERT_EQ(E_OK,pDatabaseHandler.peekDomain(std::string("newdomain"),domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains)); - ASSERT_TRUE(listDomains.empty()); + ASSERT_TRUE(listDomains.size()==1); ASSERT_EQ(domainID, DYNAMIC_ID_BOUNDARY); - domain.name = "anotherdomain"; - ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domain2ID)); + domain2.name = "anotherdomain"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain2,domain2ID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains)); ASSERT_EQ(domain2ID, DYNAMIC_ID_BOUNDARY+1); @@ -2574,6 +2659,12 @@ TEST_F(CAmMapHandlerTest, connectionIDBoundary) ASSERT_EQ(10, connectionID); connection.sinkID = 77; connection.sourceID = 77; + sink.sinkID=77; + sink.name="77"; + source.sourceID=77; + source.name="77"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink, forgetSink)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source, forgetSource)); ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID)); ASSERT_EQ(12, connectionID); ASSERT_EQ(E_UNKNOWN, pDatabaseHandler.enterConnectionDB(connection,connectionID)); @@ -2626,6 +2717,8 @@ TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary) mainConnection.mainConnectionID = 0; mainConnection.connectionState = CS_CONNECTED; mainConnection.delay = -1; + mainConnection.sinkID=2; + mainConnection.sourceID=1; for (uint16_t i = 1; i < TEST_MAX_MAINCONNECTION_ID; i++) { @@ -2640,6 +2733,12 @@ TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary) ASSERT_EQ(10, mainConnectionID); mainConnection.sinkID = 77; mainConnection.sourceID = 77; + sink.sinkID=77; + sink.name="77"; + source.sourceID=77; + source.name="77"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink, forgetSink)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source, forgetSource)); ASSERT_EQ(E_OK, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID)); ASSERT_EQ(12, mainConnectionID); ASSERT_EQ(E_UNKNOWN, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID)); @@ -2699,10 +2798,11 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_removeDomain) pCF.createDomain(domain); ASSERT_EQ(E_OK,pDatabaseHandler.peekDomain(std::string("newdomain"), domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains)); - ASSERT_TRUE(listDomains.empty()); + ASSERT_TRUE(listDomains.size()==1); ASSERT_EQ(domainID, DYNAMIC_ID_BOUNDARY); domain.name = "anotherdomain"; + domain.domainID=0; const am_Domain_s expDomain1 = {DYNAMIC_ID_BOUNDARY+1, domain.name, domain.busname, domain.nodename, domain.early, domain.complete, domain.state}; EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), newDomain(IsDomainDataEqualTo(expDomain1))).Times(1); ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domain2ID)); @@ -2869,7 +2969,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peekSourceClassID) ASSERT_EQ(E_NON_EXISTENT, pDatabaseHandler.peekSourceClassID(sourceName,sourceClassID)); //now we enter the class into the database - EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), numberOfSourceClassesChanged()).Times(1); + EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), numberOfSourceClassesChanged()).Times(13); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass)); //first we peek without an existing class @@ -2893,7 +2993,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peekSinkClassID) ASSERT_EQ(E_NON_EXISTENT, pDatabaseHandler.peekSinkClassID(sinkName,sinkClassID)); //now we enter the class into the database - EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), numberOfSinkClassesChanged()).Times(1); + EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), numberOfSinkClassesChanged()).Times(12); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID)); //first we peek without an existing class diff --git a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp index 46b2d41..a99f7d8 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -63,6 +63,21 @@ CAmRouterMapTest::~CAmRouterMapTest() void CAmRouterMapTest::SetUp() { logInfo("Routing Test started "); + am_Domain_s domain; + pCF.createDomain(domain); + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=1; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=1; + domain.domainID=4; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); } void CAmRouterMapTest::TearDown() @@ -236,6 +251,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomainNoMatchFormats) am_Source_s source; am_sourceID_t sourceID; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -244,10 +263,15 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomainNoMatchFormats) source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_MONO); + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); am_Sink_s sink; am_sinkID_t sinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; sink.domainID = domainID1; sink.name = "sink1"; @@ -256,6 +280,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomainNoMatchFormats) sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); std::vector<am_Route_s> listRoutes; @@ -301,6 +326,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomain) am_Source_s source; am_sourceID_t sourceID; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -309,10 +338,15 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomain) source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); am_Sink_s sink; am_sinkID_t sinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + sink.domainID = domainID1; sink.name = "sink1"; @@ -321,6 +355,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2withDomain) sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); std::vector<am_Route_s> listRoutes; @@ -372,6 +407,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFree) am_Source_s source, gwSource; am_sourceID_t sourceID, gwSourceID; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -387,11 +426,15 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFree) gwSource.sourceClassID = 5; gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); am_Sink_s sink, gwSink; am_sinkID_t sinkID, gwSinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; sink.domainID = domainID2; sink.name = "sink1"; @@ -407,6 +450,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFree) gwSink.muteState = MS_MUTED; gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -483,6 +527,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFreeNotFree) am_Source_s source, gwSource; am_sourceID_t sourceID, gwSourceID; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -498,11 +546,16 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFreeNotFree) gwSource.sourceClassID = 5; gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); am_Sink_s sink, gwSink; am_sinkID_t sinkID, gwSinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + sink.domainID = domainID2; sink.name = "sink1"; @@ -518,6 +571,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsOnlyFreeNotFree) gwSink.muteState = MS_MUTED; gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -611,6 +665,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsCircularGWOnlyFree) am_Source_s source, gwSource, gwSource2; am_sourceID_t sourceID, gwSourceID, gwSourceID2; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -633,12 +691,16 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsCircularGWOnlyFree) gwSource2.sourceClassID = 5; gwSource2.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource2,gwSourceID2)); am_Sink_s sink, gwSink, gwSink2; am_sinkID_t sinkID, gwSinkID, gwSinkID2; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; sink.domainID = domainID2; sink.name = "sink1"; @@ -661,6 +723,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsCircularGWOnlyFree) gwSink2.muteState = MS_MUTED; gwSink2.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink2,gwSinkID2)); @@ -754,6 +817,11 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_2) am_Source_s source, gwSource, gwSource1; am_sourceID_t sourceID, gwSourceID, gwSourceID1; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + source.domainID = domainID1; source.name = "source1"; @@ -780,6 +848,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_2) gwSource1.listConnectionFormats.push_back(CF_GENIVI_STEREO); gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); @@ -793,6 +862,9 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_2) sink.sinkClassID = 5; sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_MONO); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; gwSink.domainID = domainID1; gwSink.name = "gwSink"; @@ -810,6 +882,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_2) gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSink1.listConnectionFormats.push_back(CF_GENIVI_STEREO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -925,6 +998,10 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_1) source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_STEREO); source.listConnectionFormats.push_back(CF_GENIVI_MONO); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; gwSource.domainID = domainID2; gwSource.name = "gwsource1"; @@ -942,12 +1019,16 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_1) gwSource1.sourceClassID = 5; gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); am_Sink_s sink, gwSink, gwSink1; am_sinkID_t sinkID, gwSinkID, gwSinkID1; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; sink.domainID = domainID3; sink.name = "sink1"; @@ -971,6 +1052,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats_1) gwSink1.muteState = MS_MUTED; gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -1076,6 +1158,10 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats) am_Source_s source, gwSource, gwSource1; am_sourceID_t sourceID, gwSourceID, gwSourceID1; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -1099,6 +1185,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats) gwSource1.sourceClassID = 5; gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); @@ -1106,6 +1193,10 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats) am_Sink_s sink, gwSink, gwSink1; am_sinkID_t sinkID, gwSinkID, gwSinkID1; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + sink.domainID = domainID3; sink.name = "sink1"; sink.sinkID = 0; @@ -1128,6 +1219,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsListConnectionFormats) gwSink1.muteState = MS_MUTED; gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -1234,6 +1326,10 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains2Routes) am_Source_s source, gwSource, gwSource1, gwSource2, gwSource3; am_sourceID_t sourceID, gwSourceID, gwSourceID1, gwSourceID2, gwSourceID3; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -1270,6 +1366,7 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains2Routes) gwSource3.sourceClassID = 5; gwSource3.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); @@ -1313,7 +1410,11 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains2Routes) sink.sinkClassID = 5; sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -1482,6 +1583,10 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsNoConnection) source.sourceID = 0; source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_MONO); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; gwSource.domainID = domainID2; gwSource.name = "gwsource1"; @@ -1497,6 +1602,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsNoConnection) gwSource1.sourceClassID = 5; gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); @@ -1510,6 +1616,9 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsNoConnection) sink.sinkClassID = 5; sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; gwSink.domainID = domainID1; gwSink.name = "gwSink"; @@ -1525,6 +1634,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3DomainsNoConnection) gwSink1.muteState = MS_MUTED; gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -1625,6 +1735,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2Domains) source.sourceID = 0; source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; gwSource.domainID = domainID2; gwSource.name = "gwsource1"; @@ -1633,11 +1747,16 @@ TEST_F(CAmRouterMapTest,simpleRoute2Domains) gwSource.sourceClassID = 5; gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); am_Sink_s sink, gwSink; am_sinkID_t sinkID, gwSinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + sink.domainID = domainID2; sink.name = "sink1"; @@ -1653,6 +1772,8 @@ TEST_F(CAmRouterMapTest,simpleRoute2Domains) gwSink.muteState = MS_MUTED; gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1734,6 +1855,10 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsNoMatchConnectionFormats) source.sourceID = 0; source.sourceClassID = 5; source.listConnectionFormats.push_back(CF_GENIVI_STEREO); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; gwSource.domainID = domainID2; gwSource.name = "gwsource1"; @@ -1742,11 +1867,15 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsNoMatchConnectionFormats) gwSource.sourceClassID = 5; gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); am_Sink_s sink, gwSink; am_sinkID_t sinkID, gwSinkID; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; sink.domainID = domainID2; sink.name = "sink1"; @@ -1762,6 +1891,7 @@ TEST_F(CAmRouterMapTest,simpleRoute2DomainsNoMatchConnectionFormats) gwSink.muteState = MS_MUTED; gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1819,6 +1949,10 @@ TEST_F(CAmRouterMapTest,simpleRoute3Domains) am_Source_s source, gwSource, gwSource1; am_sourceID_t sourceID, gwSourceID, gwSourceID1; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -1841,12 +1975,17 @@ TEST_F(CAmRouterMapTest,simpleRoute3Domains) gwSource1.sourceClassID = 5; gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); am_Sink_s sink, gwSink, gwSink1; am_sinkID_t sinkID, gwSinkID, gwSinkID1; + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + sink.domainID = domainID3; sink.name = "sink1"; @@ -1869,6 +2008,7 @@ TEST_F(CAmRouterMapTest,simpleRoute3Domains) gwSink1.muteState = MS_MUTED; gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -1974,6 +2114,10 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains) am_Source_s source, gwSource, gwSource1, gwSource2; am_sourceID_t sourceID, gwSourceID, gwSourceID1, gwSourceID2; + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; source.domainID = domainID1; source.name = "source1"; @@ -2003,6 +2147,7 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains) gwSource2.sourceClassID = 5; gwSource2.listConnectionFormats.push_back(CF_GENIVI_STEREO); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(source.sourceClassID,sourceclass)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource1,gwSourceID1)); @@ -2038,7 +2183,11 @@ TEST_F(CAmRouterMapTest,simpleRoute4Domains) sink.sinkClassID = 5; sink.muteState = MS_MUTED; sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink1,gwSinkID1)); @@ -2212,12 +2361,21 @@ TEST_F(CAmRouterMapTest,route1Domain1Source1Sink) std::vector<am_CustomConnectionFormat_t> cf1; cf1.push_back(CF_GENIVI_STEREO); cf1.push_back(CF_GENIVI_ANALOG); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); enterSourceDB("source1", domainID1, cf1, sourceID); am_sinkID_t sinkID; std::vector<am_CustomConnectionFormat_t> cf2; cf2.push_back(CF_GENIVI_ANALOG); cf2.push_back(CF_GENIVI_MONO); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); enterSinkDB("sink1", domainID1, cf2, sinkID); am::am_Source_s source; @@ -2258,12 +2416,24 @@ TEST_F(CAmRouterMapTest,route1Domain1Source1Converter1Sink) std::vector<am_CustomConnectionFormat_t> cf1; cf1.push_back(CF_GENIVI_STEREO); cf1.push_back(CF_GENIVI_AUTO); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); enterSourceDB("source1", domainID1, cf1, sourceID); am_sinkID_t sinkID1, sinkID2; std::vector<am_CustomConnectionFormat_t> cf2; cf2.push_back(CF_GENIVI_MONO); cf2.push_back(CF_GENIVI_ANALOG); + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); enterSinkDB("sink1", domainID1, cf2, sinkID1); enterSinkDB("sink2", domainID1, cf2, sinkID2); @@ -2324,6 +2494,20 @@ TEST_F(CAmRouterMapTest,route1Domain1Source3Converters1Sink) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + am_domainID_t domainID1; enterDomainDB("domain1", domainID1); @@ -2431,6 +2615,20 @@ TEST_F(CAmRouterMapTest,route2Domains1Source1Sink) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + am_domainID_t domainID1, domainID2; enterDomainDB("domain1", domainID1); enterDomainDB("domain2", domainID2); @@ -2482,6 +2680,20 @@ TEST_F(CAmRouterMapTest,route3Domains1Source1Sink) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + am_domainID_t domainID1, domainID2, domainID3; enterDomainDB("domain1", domainID1); enterDomainDB("domain2", domainID2); @@ -2545,6 +2757,20 @@ TEST_F(CAmRouterMapTest,routeSource1Sink2PathThroughConv1Gate1) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + std::vector<bool> matrix; matrix.push_back(true); am_domainID_t domainID1, domainID2; @@ -2616,6 +2842,20 @@ TEST_F(CAmRouterMapTest, routeSource1Sink1PathThroughDomain2) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + std::vector<bool> matrix; matrix.push_back(true); am_domainID_t domainID1, domainID2; @@ -2681,6 +2921,20 @@ TEST_F(CAmRouterMapTest, routeSource1Sink1PathThroughGate1Conv2Gate2) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + std::vector<bool> matrix; matrix.push_back(true); am_domainID_t domainID1, domainID2; @@ -2760,6 +3014,20 @@ TEST_F(CAmRouterMapTest, routeSource1Sink1PathThroughConv1Gate1Conv2Gate2) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + std::vector<bool> matrix; matrix.push_back(true); am_domainID_t domainID1, domainID2; @@ -2870,6 +3138,20 @@ TEST_F(CAmRouterMapTest,route3Domains1Source1SinkGwCycles) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + am_domainID_t domain1ID, domain2ID, domain3ID; enterDomainDB("domain1", domain1ID); enterDomainDB("domain2", domain2ID); @@ -3038,6 +3320,20 @@ TEST_F(CAmRouterMapTest,route3Domains1Source3Gateways3Convertres1Sink) { EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK))); + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + am_domainID_t domainID1, domainID2, domainID3; enterDomainDB("domain1", domainID1); enterDomainDB("domain2", domainID2); diff --git a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt~ b/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt~ deleted file mode 100644 index ec79082..0000000 --- a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt~ +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project (AmRouterMapTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIR} - ${GTEST_INCLUDE_DIRS}) - -file(GLOB ROUTINGMAP_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" - ) - -ADD_EXECUTABLE( AmRouterMapTest ${ROUTINGMAP_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmRouterMapTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmRouterMapTest AudioManagerCore) - -INSTALL(TARGETS AmRouterMapTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - diff --git a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp index 5f59777..28a5a72 100644 --- a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp @@ -60,6 +60,21 @@ CAmRouterTest::~CAmRouterTest() void CAmRouterTest::SetUp() { logInfo("Routing Test started "); + am_Domain_s domain; + pCF.createDomain(domain); + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=5; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=5; + domain.domainID=4; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); } void CAmRouterTest::TearDown() diff --git a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ deleted file mode 100644 index 32e1206..0000000 --- a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt~ +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmRouterTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIR}) - - -file(GLOB ROUTING_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" - ) - -ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmRouterTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmRouterTest AudioManagerCore) - -INSTALL(TARGETS AmRouterTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - diff --git a/AudioManagerCore/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerCore/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index 916ff77..69cf90a 100644 --- a/AudioManagerCore/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerCore/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -57,6 +57,24 @@ CAmRoutingInterfaceTest::~CAmRoutingInterfaceTest() void CAmRoutingInterfaceTest::SetUp() { logInfo("RoutingSendInterface Test started "); + am_Domain_s domain; + pCF.createDomain(domain); + domain.domainID=0; + domain.busname="mock"; + am_domainID_t forgetDomain; + am_sinkClass_t forgetSinkClassID; + am_SinkClass_s sinkClass; + sinkClass.name="TestSinkClass"; + sinkClass.sinkClassID=1; + am_sourceClass_t forgetSourceClassID; + am_SourceClass_s sourceClass; + sourceClass.name="TestSourceClass"; + sourceClass.sourceClassID=1; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,forgetDomain)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkClassDB(sinkClass,forgetSinkClassID)); + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceClassDB(forgetSourceClassID,sourceClass)); + ASSERT_EQ(E_OK,pRoutingSender.addDomainLookup(domain)); + } @@ -73,16 +91,26 @@ TEST_F(CAmRoutingInterfaceTest,abort) am_Handle_s handle; am_connectionID_t connectionID; std::vector<am_Handle_s> listHandles; + am_Source_s source; + pCF.createSource(source); + source.sourceID=1; + source.domainID=DYNAMIC_ID_BOUNDARY; + source.name="sds"; + + + pCF.createSink(sink); pCF.createDomain(domain); domain.name = "mock"; domain.busname = "mock"; + domain.domainID=0; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; //prepare the stage ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source.sourceID)); //start a connect, expect a call on the routingInterface EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); @@ -127,8 +155,28 @@ TEST_F(CAmRoutingInterfaceTest,alreadyConnected) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; + + + am_SourceClass_s sourceclass; + + sourceclass.name="sClass"; + sourceclass.sourceClassID=5; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceclass.sourceClassID,sourceclass)); + + am_SinkClass_s sinkclass; + sinkclass.sinkClassID=5; + sinkclass.name="sname"; + + am_Source_s source; + pCF.createSource(source); + source.sourceID=1; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkclass,sinkclass.sinkClassID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source.sourceID)); EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); am_Handle_s handle; am_connectionID_t connectionID; @@ -314,8 +362,15 @@ TEST_F(CAmRoutingInterfaceTest,connect) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; + + am_Source_s source; + pCF.createSource(source); + source.sourceID=1; + source.domainID=DYNAMIC_ID_BOUNDARY; + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source.sourceID)); EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_NE(handle.handle, 0); @@ -340,8 +395,16 @@ TEST_F(CAmRoutingInterfaceTest,disconnect) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = DYNAMIC_ID_BOUNDARY; - ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); - ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + + am_Source_s source; + pCF.createSource(source); + source.sourceID=1; + source.domainID=DYNAMIC_ID_BOUNDARY; + + ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); + ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source.sourceID)); + EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID)); diff --git a/AudioManagerCore/test/CAmCommonFunctions.cpp b/AudioManagerCore/test/CAmCommonFunctions.cpp index 22331d4..d1f0594 100644 --- a/AudioManagerCore/test/CAmCommonFunctions.cpp +++ b/AudioManagerCore/test/CAmCommonFunctions.cpp @@ -292,7 +292,7 @@ void CAmCommonFunctions::createSource(am_Source_s& source) const void CAmCommonFunctions::createDomain(am_Domain_s & domain) const { - domain.domainID = 0; + domain.domainID = 4; domain.name = "AnyDomain"; domain.nodename = "AnyNode"; domain.busname = "AnyBusname"; @@ -306,8 +306,8 @@ void CAmCommonFunctions::createGateway(am_Gateway_s & gateway) gateway.name = "AnyGateway"; gateway.sinkID = 1; gateway.sourceID = 2; - gateway.controlDomainID = 1; - gateway.domainSinkID = 3; + gateway.controlDomainID = 4; + gateway.domainSinkID = 4; gateway.domainSourceID = 4; gateway.convertionMatrix = getStandardConvertionMatrix(); gateway.listSourceFormats = getStandardConnectionFormatList(); @@ -321,7 +321,7 @@ void CAmCommonFunctions::createConverter(am_Converter_s & converter) const converter.name = "AnyConverter"; converter.sinkID = 1; converter.sourceID = 2; - converter.domainID = 1; + converter.domainID = 4; converter.convertionMatrix = getStandardConvertionMatrix(); converter.listSourceFormats = getStandardConnectionFormatList(); converter.listSinkFormats = getStandardConnectionFormatList(); |