tlv/unit tests: fix tlv related unit tests

Fix one more failing testcase. While debugging, fix also one
place of list copy in M2MTLVSerializer::serialize_multiple_resource
and modify the OOM tests accordingly.

Author: TeroJaasko

source/m2mtlvserializer.cpp

@@ -146,7 +146,7 @@ bool M2MTLVSerializer::serialize_multiple_resource(const M2MResource *resource,
     uint8_t *nested_data = NULL;
     uint32_t nested_data_size = 0;
 
-    M2MResourceInstanceList instance_list = resource->resource_instances();
+    const M2MResourceInstanceList &instance_list = resource->resource_instances();
     if(!instance_list.empty()) {
         M2MResourceInstanceList::const_iterator it;
         it = instance_list.begin();
@@ -168,7 +168,6 @@ bool M2MTLVSerializer::serialize_multiple_resource(const M2MResource *resource,
     }
 
     free(nested_data);
-    nested_data = NULL;
     return success;
 }
 
@@ -193,21 +192,20 @@ bool M2MTLVSerializer::serialize_resource_instance(uint16_t id, const M2MResourc
  * Yime, TLV Format */
 bool M2MTLVSerializer::serialize_TLV_binary_int(const M2MResourceBase *resource, uint8_t type, uint16_t id, uint8_t *&data, uint32_t &size)
 {
-        int64_t valueInt = resource->get_value_int();
-        uint32_t buffer_size;
-        /* max len 8 bytes */
-        uint8_t buffer[8];
-
-        if (resource->resource_instance_type() == M2MResourceInstance::BOOLEAN) {
-            buffer_size = 1;
-            buffer[0] = valueInt;
-        }
-        else {
-            buffer_size = 8;
-            common_write_64_bit(valueInt, buffer);
-        }
+    int64_t valueInt = resource->get_value_int();
+    uint32_t buffer_size;
+    /* max len 8 bytes */
+    uint8_t buffer[8];
+
+    if (resource->resource_instance_type() == M2MResourceInstance::BOOLEAN) {
+        buffer_size = 1;
+        buffer[0] = valueInt;
+    } else {
+        buffer_size = 8;
+        common_write_64_bit(valueInt, buffer);
+    }
 
-        return serialize_TILV(type, id, buffer, buffer_size, data, size);
+    return serialize_TILV(type, id, buffer, buffer_size, data, size);
 }
 
 

test/mbedclient/utest/m2mtlvdeserializer/test_m2mtlvdeserializer.cpp

@@ -37,6 +37,7 @@ Test_M2MTLVDeserializer::~Test_M2MTLVDeserializer()
     m2mobjectinstance_stub::clear();
     m2mobject_stub::clear();
     m2mresource_stub::clear();
+    m2mresourcebase_stub::clear();
 }
 
 void Test_M2MTLVDeserializer::test_is_object_instance()
@@ -142,7 +143,7 @@ void Test_M2MTLVDeserializer::test_deserialise_object_instances()
 
     u_int8_t value[] = {"value"};
     m2mresourcebase_stub::value = value;
-    m2mresourceinstance_stub::int_value = sizeof(value);
+    m2mresourcebase_stub::int_value = sizeof(value);
 
     data = serializer->serialize( m2mobject_stub::instance_list,size);
 
@@ -229,8 +230,8 @@ void Test_M2MTLVDeserializer::test_deserialise_object_instances()
 
     m2mbase_stub::name_id_value = 300;
 
-    m2mresourceinstance_stub::int_value = 6;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 6;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( m2mobject_stub::instance_list,size);
     delete serializer;
@@ -246,8 +247,8 @@ void Test_M2MTLVDeserializer::test_deserialise_object_instances()
     free(m2mresourcebase_stub::value);
     m2mresourcebase_stub::value = NULL;
 
-    m2mresourceinstance_stub::int_value = 256;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 256;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( m2mobject_stub::instance_list,size);
     delete serializer;
@@ -263,14 +264,14 @@ void Test_M2MTLVDeserializer::test_deserialise_object_instances()
     free(m2mresourcebase_stub::value);
     m2mresourcebase_stub::value = NULL;
 
-    m2mresourceinstance_stub::int_value = 65536;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 65536;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( m2mobject_stub::instance_list,size);
     delete serializer;
 
-   deserializer->deserialise_object_instances(data,size,*object,M2MTLVDeserializer::Post);
-   deserializer->deserialise_object_instances(data,size,*object,M2MTLVDeserializer::Put);
+    deserializer->deserialise_object_instances(data,size,*object,M2MTLVDeserializer::Post);
+    deserializer->deserialise_object_instances(data,size,*object,M2MTLVDeserializer::Put);
     size = 0;
 
     if(data) {
@@ -447,14 +448,13 @@ void Test_M2MTLVDeserializer::test_deserialize_resource_instance_1()
     M2MTLVSerializer *serializer = new M2MTLVSerializer();
 
     uint32_t size = 0;
-    uint8_t* data = serializer->serialize( resource,size);
+    uint8_t* data = serializer->serialize(resource,size);
 
     delete serializer;
 
     deserializer->deserialize_resource_instances(data,size,
                                                 *resource,M2MTLVDeserializer::Put);
 
-
     free(data);
 
     delete res_instance;
@@ -594,8 +594,8 @@ void Test_M2MTLVDeserializer::test_deserialize_resource_instance()
 
     m2mbase_stub::name_id_value = 300;
 
-    m2mresourceinstance_stub::int_value = 6;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 6;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( resource,size);
     delete serializer;
@@ -610,8 +610,8 @@ void Test_M2MTLVDeserializer::test_deserialize_resource_instance()
     free(m2mresourcebase_stub::value);
     m2mresourcebase_stub::value = NULL;
 
-    m2mresourceinstance_stub::int_value = 256;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 256;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( resource,size);
     delete serializer;
@@ -626,8 +626,8 @@ void Test_M2MTLVDeserializer::test_deserialize_resource_instance()
     free(m2mresourcebase_stub::value);
     m2mresourcebase_stub::value = NULL;
 
-    m2mresourceinstance_stub::int_value = 65536;
-    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourceinstance_stub::int_value);
+    m2mresourcebase_stub::int_value = 65536;
+    m2mresourcebase_stub::value = (uint8_t*) malloc(m2mresourcebase_stub::int_value);
     serializer = new M2MTLVSerializer();
     data = serializer->serialize( resource,size);
     delete serializer;

test/mbedclient/utest/m2mtlvdeserializer/test_m2mtlvserializer.cpp

@@ -120,8 +120,12 @@ void Test_M2MTLVSerializer::test_serialize_object_out_of_memory()
     memory_fail_counter=1; //apply for 1 time failing malloc
     memory_will_fail_counter=4; //after 4 successful ones
     data = serializer->serialize( m2mobject_stub::instance_list,size);
-    CHECK(data == NULL);
+    // the data was actually encoded 
+    CHECK(data != NULL);
 
+    free(data);
+
+    // just for safety, verify once more
     memory_fail_counter=1; //apply for 1 time failing malloc
     memory_will_fail_counter=5; //after 5 successful ones
     data = serializer->serialize( m2mobject_stub::instance_list,size);
@@ -470,15 +474,21 @@ void Test_M2MTLVSerializer::test_serialize_resource_instance_out_of_memory()
     data = serializer->serialize( m2mobjectinstance_stub::resource_list,size);
     CHECK(data == NULL);
 
+    // there is now only one allocation in this sequence, so this shall pass
     memory_fail_counter=1; //apply for 1 time failing malloc
     memory_will_fail_counter=2; //after 2 successful ones
     data = serializer->serialize( m2mobjectinstance_stub::resource_list,size);
-    CHECK(data == NULL);
+    CHECK(data != NULL);
 
     m2mbase_stub::name_id_value = -1;
     data = serializer->serialize( m2mobject_stub::instance_list,size);
     CHECK(data == NULL);
 
+    // Disable the failures in allocator as the cpputest will otherwise panic 
+    // on its own cleanup which does allocation.
+    memory_fail_counter = 0;
+    memory_will_fail_counter = 0;
+
     delete res_instance;
     delete resource;
     delete instance;