diff options
author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-11-18 16:52:57 +0100 |
---|---|---|
committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-11-18 16:52:57 +0100 |
commit | 2312c029d469fcc00bc465f44c398f6460cb51e5 (patch) | |
tree | 82e5726e14c87538a0bc24475df98dc28fa55fa3 /AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp | |
parent | 948c19ca79ebc6bba9e2e50d9075630880a1c633 (diff) | |
download | audiomanager-2312c029d469fcc00bc465f44c398f6460cb51e5.tar.gz |
* Fix for inconsistency in CAmDatabaseHandlerMap/SQLite
getListMainSinks/Sources. Another minor optimizations as well.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp')
-rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 2062d6d..ac7bd03 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -552,6 +552,7 @@ TEST_F(CAmDatabaseHandlerTest,sourceVolumeChange) TEST_F(CAmDatabaseHandlerTest, peekSource) { + std::vector<am_SourceType_s> listSourceTypes; std::vector<am_Source_s> listSources; am_sourceID_t sourceID, source2ID, source3ID; am_Source_s source; @@ -564,25 +565,39 @@ TEST_F(CAmDatabaseHandlerTest, peekSource) //make sure it is not in the list ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources)); ASSERT_TRUE(listSources.empty()); + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSources(listSourceTypes)); + ASSERT_TRUE(listSourceTypes.empty()); ASSERT_EQ(sourceID, DYNAMIC_ID_BOUNDARY); //now enter the source with the same name and make sure it does not get a new ID source.name = "newsource"; ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source2ID)); + ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources)); ASSERT_EQ(sourceID, source2ID); - ASSERT_TRUE(listSources[0].sourceID==sourceID); + ASSERT_FALSE(listSources.empty()); + ASSERT_TRUE(listSources.at(0).sourceID==sourceID); + + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSources(listSourceTypes)); + ASSERT_FALSE(listSourceTypes.empty()); + ASSERT_TRUE(listSourceTypes.at(0).sourceID==sourceID); //now we peek again. This time, the source exists ASSERT_EQ(E_OK, pDatabaseHandler.peekSource(source.name,source3ID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources)); ASSERT_TRUE(listSources.size()==1); + + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSources(listSourceTypes)); + ASSERT_TRUE(listSourceTypes.size()==1); + ASSERT_TRUE(listSourceTypes.at(0).sourceID==source3ID); ASSERT_EQ(source3ID, source2ID); } + TEST_F(CAmDatabaseHandlerTest, peekSourceDouble) { + std::vector<am_SourceType_s> listSourceTypes; std::vector<am_Source_s> listSources; am_sourceID_t sourceID; am_sourceID_t source2ID; @@ -609,11 +624,17 @@ TEST_F(CAmDatabaseHandlerTest, peekSourceDouble) ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source3ID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources)); ASSERT_EQ(sourceID, source3ID); + ASSERT_TRUE(listSources.size()==1); ASSERT_TRUE(listSources[0].sourceID==sourceID); + + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSources(listSourceTypes)); + ASSERT_TRUE(listSourceTypes.size()==1); + ASSERT_TRUE(listSourceTypes[0].sourceID==source3ID); } TEST_F(CAmDatabaseHandlerTest, peekSink) { + std::vector<am_SinkType_s> listSinkTypes; std::vector<am_Sink_s> listSinks; am_sinkID_t sinkID, sink2ID, sink3ID; am_Sink_s sink; @@ -636,15 +657,24 @@ TEST_F(CAmDatabaseHandlerTest, peekSink) ASSERT_EQ(sinkID, sink2ID); ASSERT_TRUE(listSinks[0].sinkID==sinkID); + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSinks(listSinkTypes)); + ASSERT_FALSE(listSinkTypes.empty()); + ASSERT_TRUE(listSinkTypes.at(0).sinkID==sinkID); + //now we peek again, this time, the sink exists ASSERT_EQ(E_OK, pDatabaseHandler.peekSink(sink.name,sink3ID)); ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks)); ASSERT_TRUE(listSinks.size()==1); ASSERT_EQ(sink3ID, sink2ID); + + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSinks(listSinkTypes)); + ASSERT_TRUE(listSinkTypes.size()==1); + ASSERT_TRUE(listSinkTypes.at(0).sinkID==sink3ID); } TEST_F(CAmDatabaseHandlerTest, peekSinkDouble) { + std::vector<am_SinkType_s> listSinkTypes; std::vector<am_Sink_s> listSinks; am_sinkID_t sinkID; am_sinkID_t sink2ID; @@ -672,6 +702,10 @@ TEST_F(CAmDatabaseHandlerTest, peekSinkDouble) ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks)); ASSERT_EQ(sinkID, sink3ID); ASSERT_TRUE(listSinks[0].sinkID==sinkID); + + ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSinks(listSinkTypes)); + ASSERT_TRUE(listSinkTypes.size()==1); + ASSERT_TRUE(listSinkTypes[0].sinkID==sink3ID); } TEST_F(CAmDatabaseHandlerTest,changeConnectionTimingInformationCheckMainConnection) |