Merge pull request ARMmbed#500 from ARMmbed/unit_test_fixes

Fix most of the remaining unit test failures

Author: Yogesh Pande

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/m2mdevice/test_m2mdevice.cpp

@@ -18,6 +18,7 @@
 #include "m2mobject_stub.h"
 #include "m2mobjectinstance_stub.h"
 #include "m2mresource_stub.h"
+#include "m2mresourcebase_stub.h"
 #include "m2mresourceinstance_stub.h"
 #include "m2mbase_stub.h"
 
@@ -120,7 +121,7 @@ void Test_M2MDevice::test_create_resource_instance()
 
 void Test_M2MDevice::test_create_resource_string()
 {
-    m2mresourceinstance_stub::value = NULL;
+    m2mresourcebase_stub::value = NULL;
     CHECK(device->create_resource(M2MDevice::Reboot,"test") == NULL);
     CHECK(device->create_resource(M2MDevice::ErrorCode,"test") == NULL);
     CHECK(device->create_resource(M2MDevice::SupportedBindingMode,"test") == NULL);
@@ -346,10 +347,10 @@ void Test_M2MDevice::test_delete_resource_instance()
 void Test_M2MDevice::test_set_resource_value_string()
 {
     // Length 65, should fail
-    m2mresourceinstance_stub::value = NULL;
+    m2mresourcebase_stub::value = NULL;
     String max_lenght = "65656565656565656565656565656565656565656565656565656565656565656";
     m2mbase_stub::bool_value = true;
-    m2mresourceinstance_stub::bool_value = true;
+    m2mresourcebase_stub::bool_value = true;
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
                                                        "name",
@@ -451,9 +452,9 @@ void Test_M2MDevice::test_resource_value_int()
 {
     uint8_t value[] = {"10"};
     uint8_t* ptr = (uint8_t*)malloc((uint32_t)sizeof(value));
-    m2mresourceinstance_stub::value = ptr;
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::value = ptr;
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
     m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -505,10 +506,10 @@ void Test_M2MDevice::test_resource_value_string()
 {
     String test = "string";
     uint8_t value[] = {"string"};
-    m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
-    m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
+    m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::int_value = (uint32_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
                                                        "name",
@@ -538,8 +539,8 @@ void Test_M2MDevice::test_resource_value_string()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MDevice::test_is_resource_present()

test/mbedclient/utest/m2mfirmware/test_m2mfirmware.cpp

@@ -18,6 +18,7 @@
 #include "m2mobject_stub.h"
 #include "m2mobjectinstance_stub.h"
 #include "m2mresource_stub.h"
+#include "m2mresourcebase_stub.h"
 #include "m2mresourceinstance_stub.h"
 #include "m2mbase_stub.h"
 #include "nsdlaccesshelper_stub.h"
@@ -168,7 +169,7 @@ void Test_M2MFirmware::test_delete_resource()
 
 void Test_M2MFirmware::test_set_resource_value_string()
 {
-    m2mresourceinstance_stub::value = NULL;
+    m2mresourcebase_stub::value = NULL;
     m2mbase_stub::bool_value = true;
     m2mresourceinstance_stub::bool_value = true;
 
@@ -247,9 +248,9 @@ void Test_M2MFirmware::test_resource_value_int()
 {
     uint8_t value[] = {"10"};
     uint8_t* ptr = (uint8_t*)malloc((uint32_t)sizeof(value));
-    m2mresourceinstance_stub::value = ptr;
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value, value,sizeof(value));
+    m2mresourcebase_stub::value = ptr;
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value, value,sizeof(value));
     m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -284,9 +285,9 @@ void Test_M2MFirmware::test_resource_value_string()
 {
     String test = "string";
     uint8_t value[] = {"string"};
-    m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
     m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -315,8 +316,8 @@ void Test_M2MFirmware::test_resource_value_string()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MFirmware::test_is_resource_present()
@@ -383,10 +384,10 @@ void Test_M2MFirmware::test_resource_value_buffer()
     uint8_t value[] = {"buffer"};
     uint8_t *out_value = NULL;
 
-    m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
-    m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
+    m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::int_value = (uint16_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
                                                        "name",
@@ -413,13 +414,13 @@ void Test_M2MFirmware::test_resource_value_buffer()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MFirmware::test_set_resource_value_buffer()
 {
-    m2mresourceinstance_stub::bool_value = true;
+    m2mresourcebase_stub::bool_value = true;
 
     uint8_t value[] = {"value"};
     uint16_t length = (uint16_t)sizeof(value);

test/mbedclient/utest/m2mnsdlinterface/test_m2mnsdlinterface.cpp

@@ -21,6 +21,7 @@
 #include "m2mobject_stub.h"
 #include "m2mobjectinstance_stub.h"
 #include "m2mresource_stub.h"
+#include "m2mresourcebase_stub.h"
 #include "m2mresourceinstance_stub.h"
 #include "m2mresource.h"
 #include "m2mbase_stub.h"
@@ -1433,9 +1434,9 @@ void Test_M2MNsdlInterface::test_observation_to_be_sent()
     instance_list_ids.push_back(0);
 
     uint8_t value[] = {"value"};
-    m2mresourceinstance_stub::value = (uint8_t *)malloc(sizeof(value));
-    memset( m2mresourceinstance_stub::value, 0, sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::value = (uint8_t *)malloc(sizeof(value));
+    memset( m2mresourcebase_stub::value, 0, sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
     m2mresourceinstance_stub::int_value = sizeof(value);
 
     m2mbase_stub::uint16_value = 321;
@@ -1507,8 +1508,8 @@ void Test_M2MNsdlInterface::test_observation_to_be_sent()
     nsdl->observation_to_be_sent(object_instance, 500, instance_list_ids);
     free(common_stub::coap_header);
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 
     m2mbase_stub::clear();
     m2mresourceinstance_stub::clear();
@@ -1600,7 +1601,7 @@ void Test_M2MNsdlInterface::test_value_updated()
 
     m2mresourceinstance_stub::int_value = 2;
     uint8_t value[] = "1";
-    m2mresourceinstance_stub::value = value;
+    m2mresourcebase_stub::value = value;
 
     m2mresourceinstance_stub::base_type = M2MBase::Resource;
 
@@ -1631,7 +1632,7 @@ void Test_M2MNsdlInterface::test_value_updated()
     m2mbase_stub::mode_value = M2MBase::Static;
 
     m2mresourceinstance_stub::int_value = 2;
-    m2mresourceinstance_stub::value = value;
+    m2mresourcebase_stub::value = value;
 
     nsdl->value_updated(resource_instance/*,"name/0/name/0"*/);
     CHECK(observer->value_update == true);

test/mbedclient/utest/m2mresource/test_m2mresource.cpp

@@ -17,6 +17,7 @@
 #include "test_m2mresource.h"
 #include "CppUTest/MemoryLeakDetectorMallocMacros.h"
 #include "m2mbase_stub.h"
+#include "m2mresourcebase_stub.h"
 #include "m2mresourceinstance_stub.h"
 #include "m2mobjectinstance_stub.h"
 #include "m2mtlvdeserializer_stub.h"
@@ -565,7 +566,7 @@ void Test_M2MResource::test_handle_post_request()
     CHECK(resource->handle_post_request(NULL,coap_header,handler,execute_value_updated) != NULL);
 
     m2mresourceinstance_stub::int_value = sizeof(value);
-    m2mresourceinstance_stub::value = value;
+    m2mresourcebase_stub::value = value;
 
     resource->_delayed_response = false;
     sn_coap_hdr_s *coap_response = resource->handle_post_request(NULL,coap_header,handler,execute_value_updated);

test/mbedclient/utest/m2mresourceinstance/test_m2mresourceinstance.cpp

@@ -26,6 +26,7 @@
 #include "m2mobjectinstance_stub.h"
 #include "m2mobject_stub.h"
 #include "m2mresource_stub.h"
+#include "m2mresourcebase_stub.h"
 
 
 static bool cb_visited = false;
@@ -247,7 +248,7 @@ void Test_M2MResourceInstance::test_set_value()
 {
     u_int8_t value[] = {"value2"};
   //  resource_instance->_value = (u_int8_t*)malloc(sizeof(u_int8_t));
-    m2mbase_stub::bool_value = true;
+    m2mresourcebase_stub::bool_value = true;
 
     sn_nsdl_dynamic_resource_parameters_s res_param;
     m2mbase_stub::nsdl_resource = &res_param;
@@ -370,6 +371,7 @@ void Test_M2MResourceInstance::test_clear_value()
     m2mbase_stub::sn_resource = (M2MBase::lwm2m_parameters_s*) malloc(sizeof(M2MBase::lwm2m_parameters_s));
     memset(m2mbase_stub::sn_resource,0,sizeof(M2MBase::lwm2m_parameters_s));
     m2mbase_stub::sn_resource->data_type = M2MBase::STRING;
+    m2mresourcebase_stub::bool_value = true;
 
     CHECK(resource_instance->set_value(value,(u_int32_t)sizeof(value)) == true);
     resource_instance->clear_value();

test/mbedclient/utest/m2msecurity/test_m2msecurity.cpp

@@ -18,6 +18,7 @@
 #include "m2mobject_stub.h"
 #include "m2mobjectinstance_stub.h"
 #include "m2mresource_stub.h"
+#include "m2mresourcebase_stub.h"
 #include "m2mresourceinstance_stub.h"
 #include "m2mbase_stub.h"
 #include "nsdlaccesshelper_stub.h"
@@ -209,12 +210,12 @@ void Test_M2MSecurity::test_resource_value_int()
     m2mresourceinstance_stub::bool_value = true;
 
     uint8_t value[] = {"10"};
-    //m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    //m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
     uint8_t size = 0;
-    m2mresourceinstance_stub::value = String::convert_integer_to_array(10,size);
-    /*memset(m2mresourceinstance_stub::value,0,(uint32_t)size);
-    memcpy(m2mresourceinstance_stub::value, 10, size);*/
-    m2mresourceinstance_stub::int_value = (uint16_t)size;
+    m2mresourcebase_stub::value = String::convert_integer_to_array(10,size);
+    /*memset(m2mresourcebase_stub::value,0,(uint32_t)size);
+    memcpy(m2mresourcebase_stub::value, 10, size);*/
+    m2mresourcebase_stub::int_value = (uint16_t)size;
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
                                                        "name",
@@ -254,18 +255,18 @@ void Test_M2MSecurity::test_resource_value_int()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MSecurity::test_resource_value_string()
 {
     m2mresourceinstance_stub::bool_value = true;
     String test = "string";
     uint8_t value[] = {"string"};
-    m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
     m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -293,21 +294,21 @@ void Test_M2MSecurity::test_resource_value_string()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MSecurity::test_resource_value_buffer()
 {
-    m2mresourceinstance_stub::bool_value = true;
+    m2mresourcebase_stub::bool_value = true;
 
     uint8_t value[] = {"buffer"};
     uint8_t *out_value = NULL;
 
-    m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
-    memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
-    memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
-    m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
+    m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
+    memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
+    memcpy(m2mresourcebase_stub::value,value,sizeof(value));
+    m2mresourcebase_stub::int_value = (uint16_t)sizeof(value);
 
     m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
                                                        "name",
@@ -343,8 +344,8 @@ void Test_M2MSecurity::test_resource_value_buffer()
     delete m2mobjectinstance_stub::resource;
     m2mobjectinstance_stub::resource = NULL;
 
-    free(m2mresourceinstance_stub::value);
-    m2mresourceinstance_stub::value = NULL;
+    free(m2mresourcebase_stub::value);
+    m2mresourcebase_stub::value = NULL;
 }
 
 void Test_M2MSecurity::test_is_resource_present()