Merge pull request #13 from ARMmbed/ver_update

Antti Kauppila · Antti Kauppila · commit 777e0489cac1 · 2016-02-09T13:33:31.000+02:00
Updated mbec-client-c version &amp; unit tests
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ coverage
 build/
 yotta_modules/
 yotta_targets/
-
+upload.tar.gz
diff --git a/module.json b/module.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "nanostack-libservice": "^3.0.0",
-    "mbed-client-c": "^1.1.0",
+    "mbed-client-c": "^2.0.0",
     "sal-stack-nanostack": "^3.0.0",
     "mbedtls": "^2.0.0"
   },
diff --git a/test/coap-service/unittest/run_tests~ b/test/coap-service/unittest/run_tests~
diff --git a/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
@@ -46,23 +46,22 @@ struct coap_s *sn_coap_protocol_init(void *(*used_malloc_func_ptr)(uint16_t), vo
     return sn_coap_protocol_stub.expectedCoap;
 }
 
-//Yotta is not yet updated to use mbed-client-c 2.x version(git is), so do not modify these 4 yet to contain handle
-int8_t sn_coap_protocol_set_block_size(uint16_t block_size)
+int8_t sn_coap_protocol_set_block_size(struct coap_s *handle, uint16_t block_size)
 {
     return sn_coap_protocol_stub.expectedInt8;
 }
 
-int8_t sn_coap_protocol_set_duplicate_buffer_size(uint8_t size)
+int8_t sn_coap_protocol_set_duplicate_buffer_size(struct coap_s *handle, uint8_t size)
 {
     return sn_coap_protocol_stub.expectedInt8;
 }
 
-int8_t sn_coap_protocol_set_retransmission_parameters(uint8_t resending_count, uint8_t resending_intervall)
+int8_t sn_coap_protocol_set_retransmission_parameters(struct coap_s *handle, uint8_t resending_count, uint8_t resending_intervall)
 {
     return sn_coap_protocol_stub.expectedInt8;
 }
 
-int8_t sn_coap_protocol_set_retransmission_buffer(uint8_t buffer_size_messages, uint16_t buffer_size_bytes)
+int8_t sn_coap_protocol_set_retransmission_buffer(struct coap_s *handle, uint8_t buffer_size_messages, uint16_t buffer_size_bytes)
 {
     return sn_coap_protocol_stub.expectedInt8;
 }

Original file line number	Diff line number	Diff line change
`@@ -46,23 +46,22 @@ struct coap_s sn_coap_protocol_init(void (*used_malloc_func_ptr)(uint16_t), vo`
`46`	`46`	`return sn_coap_protocol_stub.expectedCoap;`
`47`	`47`	`}`
`48`	`48`
`49`		`-//Yotta is not yet updated to use mbed-client-c 2.x version(git is), so do not modify these 4 yet to contain handle`
`50`		`-int8_t sn_coap_protocol_set_block_size(uint16_t block_size)`
	`49`	`+int8_t sn_coap_protocol_set_block_size(struct coap_s *handle, uint16_t block_size)`
`51`	`50`	`{`
`52`	`51`	`return sn_coap_protocol_stub.expectedInt8;`
`53`	`52`	`}`
`54`	`53`
`55`		`-int8_t sn_coap_protocol_set_duplicate_buffer_size(uint8_t size)`
	`54`	`+int8_t sn_coap_protocol_set_duplicate_buffer_size(struct coap_s *handle, uint8_t size)`
`56`	`55`	`{`
`57`	`56`	`return sn_coap_protocol_stub.expectedInt8;`
`58`	`57`	`}`
`59`	`58`
`60`		`-int8_t sn_coap_protocol_set_retransmission_parameters(uint8_t resending_count, uint8_t resending_intervall)`
	`59`	`+int8_t sn_coap_protocol_set_retransmission_parameters(struct coap_s *handle, uint8_t resending_count, uint8_t resending_intervall)`
`61`	`60`	`{`
`62`	`61`	`return sn_coap_protocol_stub.expectedInt8;`
`63`	`62`	`}`
`64`	`63`
`65`		`-int8_t sn_coap_protocol_set_retransmission_buffer(uint8_t buffer_size_messages, uint16_t buffer_size_bytes)`
	`64`	`+int8_t sn_coap_protocol_set_retransmission_buffer(struct coap_s *handle, uint8_t buffer_size_messages, uint16_t buffer_size_bytes)`
`66`	`65`	`{`
`67`	`66`	`return sn_coap_protocol_stub.expectedInt8;`
`68`	`67`	`}`