Update unittests for nsdynmemlib API change (ARMmbed#71)

Arto Kinnunen · web-flow · commit d65b6b0eb890 · 2017-07-06T14:01:46.000+03:00
Update unittests to cope with new nsdynmemlib API.
diff --git a/test/coap-service/unittest/stub/nsdynmemLIB_stub.c b/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
@@ -10,11 +10,19 @@
 
 nsdynmemlib_stub_data_t nsdynmemlib_stub;
 
+#if NSDYNMEMLIB_API_VERSION < 2
+typedef int16_t ns_mem_block_size_t;
+typedef int16_t ns_mem_heap_size_t;
 void ns_dyn_mem_init(uint8_t *heap, uint16_t h_size, void (*passed_fptr)(heap_fail_t), mem_stat_t *info_ptr)
 {
 }
+#else
+void ns_dyn_mem_init(void *heap, uint16_t h_size, void (*passed_fptr)(heap_fail_t), mem_stat_t *info_ptr)
+{
+}
+#endif
 
-void *ns_dyn_mem_alloc(int16_t alloc_size)
+void *ns_dyn_mem_alloc(ns_mem_block_size_t alloc_size)
 {
     if (nsdynmemlib_stub.returnCounter > 0)
     {
@@ -27,7 +35,7 @@ void *ns_dyn_mem_alloc(int16_t alloc_size)
     }
 }
 
-void *ns_dyn_mem_temporary_alloc(int16_t alloc_size)
+void *ns_dyn_mem_temporary_alloc(ns_mem_block_size_t alloc_size)
 {
     if (nsdynmemlib_stub.returnCounter > 0)
     {
diff --git a/test/coap-service/unittest/stub/nsdynmemLIB_stub.h b/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
@@ -31,11 +31,6 @@ typedef struct {
 
 extern nsdynmemlib_stub_data_t nsdynmemlib_stub;
 
-
-void *ns_dyn_mem_alloc(int16_t alloc_size);
-void *ns_dyn_mem_temporary_alloc(int16_t alloc_size);
-void ns_dyn_mem_free(void *block);
-
 #ifdef __cplusplus
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,19 @@`
`10`	`10`
`11`	`11`	`nsdynmemlib_stub_data_t nsdynmemlib_stub;`
`12`	`12`
	`13`	`+#if NSDYNMEMLIB_API_VERSION < 2`
	`14`	`+typedef int16_t ns_mem_block_size_t;`
	`15`	`+typedef int16_t ns_mem_heap_size_t;`
`13`	`16`	`void ns_dyn_mem_init(uint8_t heap, uint16_t h_size, void (passed_fptr)(heap_fail_t), mem_stat_t *info_ptr)`
`14`	`17`	`{`
`15`	`18`	`}`
	`19`	`+#else`
	`20`	`+void ns_dyn_mem_init(void heap, uint16_t h_size, void (passed_fptr)(heap_fail_t), mem_stat_t *info_ptr)`
	`21`	`+{`
	`22`	`+}`
	`23`	`+#endif`
`16`	`24`
`17`		`-void *ns_dyn_mem_alloc(int16_t alloc_size)`
	`25`	`+void *ns_dyn_mem_alloc(ns_mem_block_size_t alloc_size)`
`18`	`26`	`{`
`19`	`27`	`if (nsdynmemlib_stub.returnCounter > 0)`
`20`	`28`	`{`
`@@ -27,7 +35,7 @@ void *ns_dyn_mem_alloc(int16_t alloc_size)`
`27`	`35`	`}`
`28`	`36`	`}`
`29`	`37`
`30`		`-void *ns_dyn_mem_temporary_alloc(int16_t alloc_size)`
	`38`	`+void *ns_dyn_mem_temporary_alloc(ns_mem_block_size_t alloc_size)`
`31`	`39`	`{`
`32`	`40`	`if (nsdynmemlib_stub.returnCounter > 0)`
`33`	`41`	`{`