fixup! Defining Test suite

Author: andreagilardoni

extras/test/src/kvstore/test_kvstore.cpp

@@ -40,9 +40,12 @@ bool KVStore::clear() {
 }
 
 typename KVStoreInterface::res_t KVStore::remove(const Key& key) {
+    auto el = kvmap.at(key);
     kvmap.erase(key);
 
-    return 0;
+    delete [] el.first;
+
+    return 1;
 }
 
 bool KVStore::exists(const Key& key) const {
@@ -55,6 +58,10 @@ bool KVStore::exists(const Key& key) const {
 }
 
 typename KVStoreInterface::res_t KVStore::putBytes(const Key& key, const uint8_t b[], size_t s) {
+    if(exists(key)) {
+        remove(key);
+    }
+
     uint8_t* buf = new uint8_t[s];
     std::memset(buf, 0, s);
     std::memcpy(buf, b, s);
@@ -87,39 +94,39 @@ TEST_CASE( "KVStore can store values of different types, get them and remove the
 
         REQUIRE( store.putChar("0", value) == sizeof(value));
         REQUIRE( store.getChar("0") == value );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 
     SECTION( "adding a uchar and getting it back" ) {
         unsigned char value = 0x55;
 
         REQUIRE( store.putUChar("0", value) == sizeof(value));
         REQUIRE( store.getUChar("0") == value );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 
     SECTION( "adding a short and getting it back" ) {
         short value = 0x5555;
 
         REQUIRE( store.putShort("0", value) == sizeof(value));
         REQUIRE( store.getShort("0") == value );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 
     SECTION( "adding an unsigned short and getting it back" ) {
         unsigned short value = 0x5555;
 
         REQUIRE( store.putUShort("0", value) == sizeof(value));
         REQUIRE( store.getUShort("0") == value );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 
     SECTION( "adding an uint32_t and getting it back" ) {
         uint32_t value = 0x01020304;
 
         REQUIRE( store.putUInt("0", value) == sizeof(value));
         REQUIRE( store.getUInt("0") == value );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 
     SECTION( "adding a string and getting it back" ) {
@@ -130,7 +137,7 @@ TEST_CASE( "KVStore can store values of different types, get them and remove the
 
         store.getString("0", res, 6);
         REQUIRE( strcmp(res, value) == 0 );
-        REQUIRE( store.remove("0") == 0 );
+        REQUIRE( store.remove("0") == 1 );
     }
 }
 
@@ -184,4 +191,9 @@ TEST_CASE( "KVStore references are a useful tool to indirectly access kvstore",
 
         REQUIRE(ref2 == 0x56565656);
     }
+
+    REQUIRE( store.remove("0") == 1 );
+    REQUIRE( store.remove("1") == 1 );
+    REQUIRE( store.remove("2") == 1 );
+    REQUIRE( store.remove("3") == 1 );
 }