summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2014-11-03 10:31:16 +0100
committerChristian Linke <christian.linke@bmw.de>2014-11-03 18:38:25 +0100
commit1779ea82b6e7792c65103d1dead8d301950a6c10 (patch)
treeae7c8dc701c64291c70a090e99f0c303850d0552
parentc8ba6c38648138ea10641acc2c89ebec543a3ce5 (diff)
downloadaudiomanager-1779ea82b6e7792c65103d1dead8d301950a6c10.tar.gz
* Fixed missing reserved flag for MapHandler and corresponding tests
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp3
-rw-r--r--AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp3
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
index d3df07f..a7b765d 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
@@ -399,7 +399,7 @@ template <typename TMapKey,class TMapObject> bool CAmDatabaseHandlerMap::CAmMapp
nextID = sourceID.mCurrentValue++;
}
- if( nextID == lastID )
+ if( sourceID.mCurrentValue == lastID )
{
notFreeIDs = true;
break;
@@ -864,6 +864,7 @@ am_Error_e CAmDatabaseHandlerMap::enterConnectionDB(const am_Connection_s& conne
connectionID = nextID;
mMappedData.mConnectionMap[nextID] = connection;
mMappedData.mConnectionMap[nextID].connectionID = nextID;
+ mMappedData.mConnectionMap[nextID].reserved = true;
}
else
{
diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
index 25c61cc..d4351b9 100644
--- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
@@ -2302,6 +2302,7 @@ TEST_F(CAmMapHandlerTest, connectionIDBoundary)
if( i < TEST_MAX_CONNECTION_ID )
{
ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+ ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
ASSERT_EQ(i, connectionID);
}
}
@@ -2309,6 +2310,7 @@ TEST_F(CAmMapHandlerTest, connectionIDBoundary)
ASSERT_EQ(E_OK, pDatabaseHandler.getListConnections(connectionList));
ASSERT_EQ(TEST_MAX_CONNECTION_ID-1, connectionList.size());
ASSERT_EQ(E_UNKNOWN, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+ logInfo("here");
ASSERT_EQ(0, connectionID);
ASSERT_EQ(E_OK, pDatabaseHandler.removeConnection(10));
@@ -2353,6 +2355,7 @@ TEST_F(CAmMapHandlerTest, mainConnectionIDBoundary)
if( i < TEST_MAX_CONNECTION_ID )
{
ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+ ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
ASSERT_EQ(i, connectionID);
connectionIDList.push_back(i);
}
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
index 257d1e6..5cff152 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
@@ -29,12 +29,8 @@
#include "CAmControlSender.h"
#include "CAmRouter.h"
#include "config.h"
+#include "CAmDatabaseHandlerMap.h"
-#ifdef WITH_DATABASE_STORAGE
- #include "CAmDatabaseHandlerSQLite.h"
-#else
- #include "CAmDatabaseHandlerMap.h"
-#endif
namespace am
{