diff options
author | Martin Koch <51775589+mkoch-aditg@users.noreply.github.com> | 2020-07-24 07:41:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-24 07:41:20 +0200 |
commit | 39e6759f9e972d23bb1f7831da80983d32f9c1ea (patch) | |
tree | 79f4bfa043dff9be147e52d3be6e4f67e0f7fece /AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp | |
parent | 4b34f9dc67e4ff1948d233346c2e5e3b14b8e78a (diff) | |
parent | 803e0cf63c20c5f756b5f1bc1dfe332a9a1c3a18 (diff) | |
download | audiomanager-39e6759f9e972d23bb1f7831da80983d32f9c1ea.tar.gz |
Merge pull request #58 from GENIVI/EarlyAudio
Early Audio implementation
Diffstat (limited to 'AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp')
-rw-r--r-- | AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp index 6e10d19..cbbfc06 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp +++ b/AudioManagerCore/test/AmMapHandlerTest/CAmMapHandlerTest.cpp @@ -2817,8 +2817,8 @@ TEST_F(CAmMapHandlerTest, connectionIDBoundary) 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)); - ASSERT_EQ(0, connectionID); + ASSERT_EQ(E_ALREADY_EXISTS, pDatabaseHandler.enterConnectionDB(connection,connectionID)); + ASSERT_EQ(12, connectionID); } TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary) @@ -2892,10 +2892,12 @@ TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary) #else EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), timingInformationChanged(_, _)).Times(1); #endif - EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), removedMainConnection(_)).Times(2); - EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), mainConnectionStateChanged(_, _)).Times(3); + EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), removedMainConnection(_)).Times(3); + EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), mainConnectionStateChanged(_, _)).Times(4); ASSERT_EQ(E_OK, pDatabaseHandler.removeMainConnectionDB(10)); ASSERT_EQ(E_OK, pDatabaseHandler.removeMainConnectionDB(12)); + // drop also last dynamic connection before entering again + ASSERT_EQ(E_OK, pDatabaseHandler.removeMainConnectionDB(mainConnectionID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID)); ASSERT_EQ(10, mainConnectionID); mainConnection.sinkID = 77; @@ -2917,8 +2919,8 @@ TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary) 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)); - ASSERT_EQ(0, mainConnectionID); + ASSERT_EQ(E_ALREADY_EXISTS, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID)); + ASSERT_EQ(12, mainConnectionID); } TEST_F(CAmMapHandlerTest, increaseID) |