Squashed 'features/nanostack/coap-service/' changes from 3b447d2..e9edb1b

Jarkko Paso · Jarkko Paso · commit 928754fbc507 · 2019-08-26T15:21:37.000+03:00
e9edb1b Match COAP test stub to updated mbed-coap API (#124) git-subtree-dir: features/nanostack/coap-service git-subtree-split: e9edb1b
diff --git a/test/coap-service/unittest/MakefileWorker.mk b/test/coap-service/unittest/MakefileWorker.mk
@@ -544,7 +544,6 @@ endif
 	/usr/share/cpputest/scripts/filterGcov.sh $(GCOV_OUTPUT) $(GCOV_ERROR) $(GCOV_REPORT) $(TEST_OUTPUT)
 	$(SILENCE)cat $(GCOV_REPORT)
 	$(SILENCE)mkdir -p gcov
-	$(SILENCE)mv *.gcov gcov
 	$(SILENCE)mv gcov_* gcov
 	@echo "See gcov directory for details"
 
diff --git a/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c b/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
@@ -209,7 +209,7 @@ bool test_coap_message_handler_coap_msg_process()
     sn_coap_protocol_stub.expectedHeader->msg_code = 333;
     nsdynmemlib_stub.returnCounter = 1;
 
-    if (-1 != coap_message_handler_coap_msg_process(handle, 0, buf, 61131, 22, ns_in6addr_any, NULL, 0, process_cb)) {
+    if (-1 != coap_message_handler_coap_msg_process(handle, 0, 61131, buf, 22, ns_in6addr_any, NULL, 0, process_cb)) {
         goto exit;
     }
 
diff --git a/test/coap-service/unittest/stub/sn_coap_builder_stub.c b/test/coap-service/unittest/stub/sn_coap_builder_stub.c
@@ -34,22 +34,22 @@
 
 sn_coap_builder_stub_def sn_coap_builder_stub;
 
-sn_coap_hdr_s *sn_coap_build_response(struct coap_s *handle, sn_coap_hdr_s *coap_packet_ptr, uint8_t msg_code)
+sn_coap_hdr_s *sn_coap_build_response(struct coap_s *handle, const sn_coap_hdr_s *coap_packet_ptr, uint8_t msg_code)
 {
     return sn_coap_builder_stub.expectedHeader;
 }
 
-int16_t sn_coap_builder(uint8_t *dst_packet_data_ptr, sn_coap_hdr_s *src_coap_msg_ptr)
+int16_t sn_coap_builder(uint8_t *dst_packet_data_ptr, const sn_coap_hdr_s *src_coap_msg_ptr)
 {
     return sn_coap_builder_stub.expectedInt16;
 }
 
-uint16_t sn_coap_builder_calc_needed_packet_data_size(sn_coap_hdr_s *src_coap_msg_ptr)
+uint16_t sn_coap_builder_calc_needed_packet_data_size(const sn_coap_hdr_s *src_coap_msg_ptr)
 {
     return sn_coap_builder_stub.expectedUint16;
 }
 
-uint16_t sn_coap_builder_calc_needed_packet_data_size_2(sn_coap_hdr_s *src_coap_msg_ptr, uint16_t blockwise_payload_size)
+uint16_t sn_coap_builder_calc_needed_packet_data_size_2(const sn_coap_hdr_s *src_coap_msg_ptr, uint16_t blockwise_payload_size)
 {
     return sn_coap_builder_stub.expectedUint16;
 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ bool test_coap_message_handler_coap_msg_process()`
`209`	`209`	`sn_coap_protocol_stub.expectedHeader->msg_code = 333;`
`210`	`210`	`nsdynmemlib_stub.returnCounter = 1;`
`211`	`211`
`212`		`- if (-1 != coap_message_handler_coap_msg_process(handle, 0, buf, 61131, 22, ns_in6addr_any, NULL, 0, process_cb)) {`
	`212`	`+ if (-1 != coap_message_handler_coap_msg_process(handle, 0, 61131, buf, 22, ns_in6addr_any, NULL, 0, process_cb)) {`
`213`	`213`	`goto exit;`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -34,22 +34,22 @@`
`34`	`34`
`35`	`35`	`sn_coap_builder_stub_def sn_coap_builder_stub;`
`36`	`36`
`37`		`-sn_coap_hdr_s sn_coap_build_response(struct coap_s handle, sn_coap_hdr_s *coap_packet_ptr, uint8_t msg_code)`
	`37`	`+sn_coap_hdr_s sn_coap_build_response(struct coap_s handle, const sn_coap_hdr_s *coap_packet_ptr, uint8_t msg_code)`
`38`	`38`	`{`
`39`	`39`	`return sn_coap_builder_stub.expectedHeader;`
`40`	`40`	`}`
`41`	`41`
`42`		`-int16_t sn_coap_builder(uint8_t dst_packet_data_ptr, sn_coap_hdr_s src_coap_msg_ptr)`
	`42`	`+int16_t sn_coap_builder(uint8_t dst_packet_data_ptr, const sn_coap_hdr_s src_coap_msg_ptr)`
`43`	`43`	`{`
`44`	`44`	`return sn_coap_builder_stub.expectedInt16;`
`45`	`45`	`}`
`46`	`46`
`47`		`-uint16_t sn_coap_builder_calc_needed_packet_data_size(sn_coap_hdr_s *src_coap_msg_ptr)`
	`47`	`+uint16_t sn_coap_builder_calc_needed_packet_data_size(const sn_coap_hdr_s *src_coap_msg_ptr)`
`48`	`48`	`{`
`49`	`49`	`return sn_coap_builder_stub.expectedUint16;`
`50`	`50`	`}`
`51`	`51`
`52`		`-uint16_t sn_coap_builder_calc_needed_packet_data_size_2(sn_coap_hdr_s *src_coap_msg_ptr, uint16_t blockwise_payload_size)`
	`52`	`+uint16_t sn_coap_builder_calc_needed_packet_data_size_2(const sn_coap_hdr_s *src_coap_msg_ptr, uint16_t blockwise_payload_size)`
`53`	`53`	`{`
`54`	`54`	`return sn_coap_builder_stub.expectedUint16;`
`55`	`55`	`}`