Skip to content

Commit b05a343

Browse files
author
Yogesh Pande
authored
Merge pull request ARMmbed#500 from ARMmbed/unit_test_fixes
Fix most of the remaining unit test failures
2 parents 9565d5d + c5cfc8d commit b05a343

File tree

13 files changed

+145
-129
lines changed

13 files changed

+145
-129
lines changed

‎source/m2mtlvserializer.cpp

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ bool M2MTLVSerializer::serialize_multiple_resource(const M2MResource *resource,
146146
uint8_t *nested_data = NULL;
147147
uint32_t nested_data_size = 0;
148148

149-
M2MResourceInstanceList instance_list = resource->resource_instances();
149+
const M2MResourceInstanceList &instance_list = resource->resource_instances();
150150
if(!instance_list.empty()) {
151151
M2MResourceInstanceList::const_iterator it;
152152
it = instance_list.begin();
@@ -168,7 +168,6 @@ bool M2MTLVSerializer::serialize_multiple_resource(const M2MResource *resource,
168168
}
169169

170170
free(nested_data);
171-
nested_data = NULL;
172171
return success;
173172
}
174173

@@ -193,21 +192,20 @@ bool M2MTLVSerializer::serialize_resource_instance(uint16_t id, const M2MResourc
193192
* Yime, TLV Format */
194193
bool M2MTLVSerializer::serialize_TLV_binary_int(const M2MResourceBase *resource, uint8_t type, uint16_t id, uint8_t *&data, uint32_t &size)
195194
{
196-
int64_t valueInt = resource->get_value_int();
197-
uint32_t buffer_size;
198-
/* max len 8 bytes */
199-
uint8_t buffer[8];
200-
201-
if (resource->resource_instance_type() == M2MResourceInstance::BOOLEAN) {
202-
buffer_size = 1;
203-
buffer[0] = valueInt;
204-
}
205-
else {
206-
buffer_size = 8;
207-
common_write_64_bit(valueInt, buffer);
208-
}
195+
int64_t valueInt = resource->get_value_int();
196+
uint32_t buffer_size;
197+
/* max len 8 bytes */
198+
uint8_t buffer[8];
199+
200+
if (resource->resource_instance_type() == M2MResourceInstance::BOOLEAN) {
201+
buffer_size = 1;
202+
buffer[0] = valueInt;
203+
} else {
204+
buffer_size = 8;
205+
common_write_64_bit(valueInt, buffer);
206+
}
209207

210-
return serialize_TILV(type, id, buffer, buffer_size, data, size);
208+
return serialize_TILV(type, id, buffer, buffer_size, data, size);
211209
}
212210

213211

‎test/mbedclient/utest/m2mdevice/test_m2mdevice.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "m2mobject_stub.h"
1919
#include "m2mobjectinstance_stub.h"
2020
#include "m2mresource_stub.h"
21+
#include "m2mresourcebase_stub.h"
2122
#include "m2mresourceinstance_stub.h"
2223
#include "m2mbase_stub.h"
2324

@@ -120,7 +121,7 @@ void Test_M2MDevice::test_create_resource_instance()
120121

121122
void Test_M2MDevice::test_create_resource_string()
122123
{
123-
m2mresourceinstance_stub::value = NULL;
124+
m2mresourcebase_stub::value = NULL;
124125
CHECK(device->create_resource(M2MDevice::Reboot,"test") == NULL);
125126
CHECK(device->create_resource(M2MDevice::ErrorCode,"test") == NULL);
126127
CHECK(device->create_resource(M2MDevice::SupportedBindingMode,"test") == NULL);
@@ -346,10 +347,10 @@ void Test_M2MDevice::test_delete_resource_instance()
346347
void Test_M2MDevice::test_set_resource_value_string()
347348
{
348349
// Length 65, should fail
349-
m2mresourceinstance_stub::value = NULL;
350+
m2mresourcebase_stub::value = NULL;
350351
String max_lenght = "65656565656565656565656565656565656565656565656565656565656565656";
351352
m2mbase_stub::bool_value = true;
352-
m2mresourceinstance_stub::bool_value = true;
353+
m2mresourcebase_stub::bool_value = true;
353354

354355
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
355356
"name",
@@ -451,9 +452,9 @@ void Test_M2MDevice::test_resource_value_int()
451452
{
452453
uint8_t value[] = {"10"};
453454
uint8_t* ptr = (uint8_t*)malloc((uint32_t)sizeof(value));
454-
m2mresourceinstance_stub::value = ptr;
455-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
456-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
455+
m2mresourcebase_stub::value = ptr;
456+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
457+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
457458
m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
458459

459460
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -505,10 +506,10 @@ void Test_M2MDevice::test_resource_value_string()
505506
{
506507
String test = "string";
507508
uint8_t value[] = {"string"};
508-
m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
509-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
510-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
511-
m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
509+
m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
510+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
511+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
512+
m2mresourcebase_stub::int_value = (uint32_t)sizeof(value);
512513

513514
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
514515
"name",
@@ -538,8 +539,8 @@ void Test_M2MDevice::test_resource_value_string()
538539
delete m2mobjectinstance_stub::resource;
539540
m2mobjectinstance_stub::resource = NULL;
540541

541-
free(m2mresourceinstance_stub::value);
542-
m2mresourceinstance_stub::value = NULL;
542+
free(m2mresourcebase_stub::value);
543+
m2mresourcebase_stub::value = NULL;
543544
}
544545

545546
void Test_M2MDevice::test_is_resource_present()

‎test/mbedclient/utest/m2mfirmware/test_m2mfirmware.cpp

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "m2mobject_stub.h"
1919
#include "m2mobjectinstance_stub.h"
2020
#include "m2mresource_stub.h"
21+
#include "m2mresourcebase_stub.h"
2122
#include "m2mresourceinstance_stub.h"
2223
#include "m2mbase_stub.h"
2324
#include "nsdlaccesshelper_stub.h"
@@ -168,7 +169,7 @@ void Test_M2MFirmware::test_delete_resource()
168169

169170
void Test_M2MFirmware::test_set_resource_value_string()
170171
{
171-
m2mresourceinstance_stub::value = NULL;
172+
m2mresourcebase_stub::value = NULL;
172173
m2mbase_stub::bool_value = true;
173174
m2mresourceinstance_stub::bool_value = true;
174175

@@ -247,9 +248,9 @@ void Test_M2MFirmware::test_resource_value_int()
247248
{
248249
uint8_t value[] = {"10"};
249250
uint8_t* ptr = (uint8_t*)malloc((uint32_t)sizeof(value));
250-
m2mresourceinstance_stub::value = ptr;
251-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
252-
memcpy(m2mresourceinstance_stub::value, value,sizeof(value));
251+
m2mresourcebase_stub::value = ptr;
252+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
253+
memcpy(m2mresourcebase_stub::value, value,sizeof(value));
253254
m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
254255

255256
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -284,9 +285,9 @@ void Test_M2MFirmware::test_resource_value_string()
284285
{
285286
String test = "string";
286287
uint8_t value[] = {"string"};
287-
m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
288-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
289-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
288+
m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
289+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
290+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
290291
m2mresourceinstance_stub::int_value = (uint32_t)sizeof(value);
291292

292293
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -315,8 +316,8 @@ void Test_M2MFirmware::test_resource_value_string()
315316
delete m2mobjectinstance_stub::resource;
316317
m2mobjectinstance_stub::resource = NULL;
317318

318-
free(m2mresourceinstance_stub::value);
319-
m2mresourceinstance_stub::value = NULL;
319+
free(m2mresourcebase_stub::value);
320+
m2mresourcebase_stub::value = NULL;
320321
}
321322

322323
void Test_M2MFirmware::test_is_resource_present()
@@ -383,10 +384,10 @@ void Test_M2MFirmware::test_resource_value_buffer()
383384
uint8_t value[] = {"buffer"};
384385
uint8_t *out_value = NULL;
385386

386-
m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
387-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
388-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
389-
m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
387+
m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
388+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
389+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
390+
m2mresourcebase_stub::int_value = (uint16_t)sizeof(value);
390391

391392
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
392393
"name",
@@ -413,13 +414,13 @@ void Test_M2MFirmware::test_resource_value_buffer()
413414
delete m2mobjectinstance_stub::resource;
414415
m2mobjectinstance_stub::resource = NULL;
415416

416-
free(m2mresourceinstance_stub::value);
417-
m2mresourceinstance_stub::value = NULL;
417+
free(m2mresourcebase_stub::value);
418+
m2mresourcebase_stub::value = NULL;
418419
}
419420

420421
void Test_M2MFirmware::test_set_resource_value_buffer()
421422
{
422-
m2mresourceinstance_stub::bool_value = true;
423+
m2mresourcebase_stub::bool_value = true;
423424

424425
uint8_t value[] = {"value"};
425426
uint16_t length = (uint16_t)sizeof(value);

‎test/mbedclient/utest/m2mnsdlinterface/test_m2mnsdlinterface.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "m2mobject_stub.h"
2222
#include "m2mobjectinstance_stub.h"
2323
#include "m2mresource_stub.h"
24+
#include "m2mresourcebase_stub.h"
2425
#include "m2mresourceinstance_stub.h"
2526
#include "m2mresource.h"
2627
#include "m2mbase_stub.h"
@@ -1433,9 +1434,9 @@ void Test_M2MNsdlInterface::test_observation_to_be_sent()
14331434
instance_list_ids.push_back(0);
14341435

14351436
uint8_t value[] = {"value"};
1436-
m2mresourceinstance_stub::value = (uint8_t *)malloc(sizeof(value));
1437-
memset( m2mresourceinstance_stub::value, 0, sizeof(value));
1438-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
1437+
m2mresourcebase_stub::value = (uint8_t *)malloc(sizeof(value));
1438+
memset( m2mresourcebase_stub::value, 0, sizeof(value));
1439+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
14391440
m2mresourceinstance_stub::int_value = sizeof(value);
14401441

14411442
m2mbase_stub::uint16_value = 321;
@@ -1507,8 +1508,8 @@ void Test_M2MNsdlInterface::test_observation_to_be_sent()
15071508
nsdl->observation_to_be_sent(object_instance, 500, instance_list_ids);
15081509
free(common_stub::coap_header);
15091510

1510-
free(m2mresourceinstance_stub::value);
1511-
m2mresourceinstance_stub::value = NULL;
1511+
free(m2mresourcebase_stub::value);
1512+
m2mresourcebase_stub::value = NULL;
15121513

15131514
m2mbase_stub::clear();
15141515
m2mresourceinstance_stub::clear();
@@ -1600,7 +1601,7 @@ void Test_M2MNsdlInterface::test_value_updated()
16001601

16011602
m2mresourceinstance_stub::int_value = 2;
16021603
uint8_t value[] = "1";
1603-
m2mresourceinstance_stub::value = value;
1604+
m2mresourcebase_stub::value = value;
16041605

16051606
m2mresourceinstance_stub::base_type = M2MBase::Resource;
16061607

@@ -1631,7 +1632,7 @@ void Test_M2MNsdlInterface::test_value_updated()
16311632
m2mbase_stub::mode_value = M2MBase::Static;
16321633

16331634
m2mresourceinstance_stub::int_value = 2;
1634-
m2mresourceinstance_stub::value = value;
1635+
m2mresourcebase_stub::value = value;
16351636

16361637
nsdl->value_updated(resource_instance/*,"name/0/name/0"*/);
16371638
CHECK(observer->value_update == true);

‎test/mbedclient/utest/m2mresource/test_m2mresource.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "test_m2mresource.h"
1818
#include "CppUTest/MemoryLeakDetectorMallocMacros.h"
1919
#include "m2mbase_stub.h"
20+
#include "m2mresourcebase_stub.h"
2021
#include "m2mresourceinstance_stub.h"
2122
#include "m2mobjectinstance_stub.h"
2223
#include "m2mtlvdeserializer_stub.h"
@@ -565,7 +566,7 @@ void Test_M2MResource::test_handle_post_request()
565566
CHECK(resource->handle_post_request(NULL,coap_header,handler,execute_value_updated) != NULL);
566567

567568
m2mresourceinstance_stub::int_value = sizeof(value);
568-
m2mresourceinstance_stub::value = value;
569+
m2mresourcebase_stub::value = value;
569570

570571
resource->_delayed_response = false;
571572
sn_coap_hdr_s *coap_response = resource->handle_post_request(NULL,coap_header,handler,execute_value_updated);

‎test/mbedclient/utest/m2mresourceinstance/test_m2mresourceinstance.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "m2mobjectinstance_stub.h"
2727
#include "m2mobject_stub.h"
2828
#include "m2mresource_stub.h"
29+
#include "m2mresourcebase_stub.h"
2930

3031

3132
static bool cb_visited = false;
@@ -247,7 +248,7 @@ void Test_M2MResourceInstance::test_set_value()
247248
{
248249
u_int8_t value[] = {"value2"};
249250
// resource_instance->_value = (u_int8_t*)malloc(sizeof(u_int8_t));
250-
m2mbase_stub::bool_value = true;
251+
m2mresourcebase_stub::bool_value = true;
251252

252253
sn_nsdl_dynamic_resource_parameters_s res_param;
253254
m2mbase_stub::nsdl_resource = &res_param;
@@ -370,6 +371,7 @@ void Test_M2MResourceInstance::test_clear_value()
370371
m2mbase_stub::sn_resource = (M2MBase::lwm2m_parameters_s*) malloc(sizeof(M2MBase::lwm2m_parameters_s));
371372
memset(m2mbase_stub::sn_resource,0,sizeof(M2MBase::lwm2m_parameters_s));
372373
m2mbase_stub::sn_resource->data_type = M2MBase::STRING;
374+
m2mresourcebase_stub::bool_value = true;
373375

374376
CHECK(resource_instance->set_value(value,(u_int32_t)sizeof(value)) == true);
375377
resource_instance->clear_value();

‎test/mbedclient/utest/m2msecurity/test_m2msecurity.cpp

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "m2mobject_stub.h"
1919
#include "m2mobjectinstance_stub.h"
2020
#include "m2mresource_stub.h"
21+
#include "m2mresourcebase_stub.h"
2122
#include "m2mresourceinstance_stub.h"
2223
#include "m2mbase_stub.h"
2324
#include "nsdlaccesshelper_stub.h"
@@ -209,12 +210,12 @@ void Test_M2MSecurity::test_resource_value_int()
209210
m2mresourceinstance_stub::bool_value = true;
210211

211212
uint8_t value[] = {"10"};
212-
//m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
213+
//m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
213214
uint8_t size = 0;
214-
m2mresourceinstance_stub::value = String::convert_integer_to_array(10,size);
215-
/*memset(m2mresourceinstance_stub::value,0,(uint32_t)size);
216-
memcpy(m2mresourceinstance_stub::value, 10, size);*/
217-
m2mresourceinstance_stub::int_value = (uint16_t)size;
215+
m2mresourcebase_stub::value = String::convert_integer_to_array(10,size);
216+
/*memset(m2mresourcebase_stub::value,0,(uint32_t)size);
217+
memcpy(m2mresourcebase_stub::value, 10, size);*/
218+
m2mresourcebase_stub::int_value = (uint16_t)size;
218219

219220
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
220221
"name",
@@ -254,18 +255,18 @@ void Test_M2MSecurity::test_resource_value_int()
254255
delete m2mobjectinstance_stub::resource;
255256
m2mobjectinstance_stub::resource = NULL;
256257

257-
free(m2mresourceinstance_stub::value);
258-
m2mresourceinstance_stub::value = NULL;
258+
free(m2mresourcebase_stub::value);
259+
m2mresourcebase_stub::value = NULL;
259260
}
260261

261262
void Test_M2MSecurity::test_resource_value_string()
262263
{
263264
m2mresourceinstance_stub::bool_value = true;
264265
String test = "string";
265266
uint8_t value[] = {"string"};
266-
m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
267-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
268-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
267+
m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
268+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
269+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
269270
m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
270271

271272
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
@@ -293,21 +294,21 @@ void Test_M2MSecurity::test_resource_value_string()
293294
delete m2mobjectinstance_stub::resource;
294295
m2mobjectinstance_stub::resource = NULL;
295296

296-
free(m2mresourceinstance_stub::value);
297-
m2mresourceinstance_stub::value = NULL;
297+
free(m2mresourcebase_stub::value);
298+
m2mresourcebase_stub::value = NULL;
298299
}
299300

300301
void Test_M2MSecurity::test_resource_value_buffer()
301302
{
302-
m2mresourceinstance_stub::bool_value = true;
303+
m2mresourcebase_stub::bool_value = true;
303304

304305
uint8_t value[] = {"buffer"};
305306
uint8_t *out_value = NULL;
306307

307-
m2mresourceinstance_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
308-
memset(m2mresourceinstance_stub::value,0,(uint32_t)sizeof(value));
309-
memcpy(m2mresourceinstance_stub::value,value,sizeof(value));
310-
m2mresourceinstance_stub::int_value = (uint16_t)sizeof(value);
308+
m2mresourcebase_stub::value = (uint8_t*)malloc((uint32_t)sizeof(value));
309+
memset(m2mresourcebase_stub::value,0,(uint32_t)sizeof(value));
310+
memcpy(m2mresourcebase_stub::value,value,sizeof(value));
311+
m2mresourcebase_stub::int_value = (uint16_t)sizeof(value);
311312

312313
m2mobjectinstance_stub::resource = new M2MResource(*m2mobject_stub::inst,
313314
"name",
@@ -343,8 +344,8 @@ void Test_M2MSecurity::test_resource_value_buffer()
343344
delete m2mobjectinstance_stub::resource;
344345
m2mobjectinstance_stub::resource = NULL;
345346

346-
free(m2mresourceinstance_stub::value);
347-
m2mresourceinstance_stub::value = NULL;
347+
free(m2mresourcebase_stub::value);
348+
m2mresourcebase_stub::value = NULL;
348349
}
349350

350351
void Test_M2MSecurity::test_is_resource_present()

0 commit comments

Comments
 (0)