Fixing unit tests based on new coap library

Author: Yogesh Pande

Makefile

@@ -24,9 +24,6 @@ override CFLAGS += -I$(SERVLIB_DIR)/libService/
 NANOSTACK_DIR := ../nanostack
 override CFLAGS += -I$(NANOSTACK_DIR)/nanostack/
 
-NSDLC_DIR := ../nsdl-c
-override CFLAGS += -I$(NSDLC_DIR)/nsdl-c
-
 COAP_DIR := ../libcoap
 override CFLAGS += -I$(COAP_DIR)/libcoap
 

source/coap_service_api.c

@@ -10,7 +10,6 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "sn_nsdl.h"
 #include "sn_coap_header.h"
 #include "coap_service_api.h"
 #include "coap_message_handler.h"

test/coap-service/unittest/makefile_defines.txt

@@ -15,15 +15,15 @@ INCLUDE_DIRS =\
   ../../../../yotta_modules/nanostack-randlib/mbed-client-randlib/ \
   ../../../../yotta_modules/nanostack-libservice/ \
   ../../../../yotta_modules/nanostack-libservice/mbed-client-libservice/ \
-  ../../../../yotta_modules/mbed-client-c/nsdl-c/ \
-  ../../../../yotta_modules/mbed-client-c/source/libCoap/src/include/ \
+  ../../../../yotta_modules/libcoap/libcoap/ \
+  ../../../../yotta_modules/libcoap/source/include/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/nanostack-event-loop/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/source/ \
   ../../../../yotta_modules/mbed-trace/ \
   ../../../../../nanostack/nanostack/\
   ../../../../../libService/libService/\
-  ../../../../../nsdl-c/nsdl-c/\
-  ../../../../../nsdl-c/source/libCoap/src/include/\
+  ../../../../../libcoap/libcoap/\
+  ../../../../../libcoap/source/include/\
   ../../../../../event-loop/nanostack-event-loop/\
   ../../../../../event-loop/source/ \
   ../../../../../mbedtls/include/ \

test/coap-service/unittest/stub/coap_service_api_stub.c

@@ -8,7 +8,6 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "sn_nsdl.h"
 #include "sn_coap_header.h"
 #include "coap_service_api.h"
 #include "coap_message_handler.h"

test/coap-service/unittest/stub/sn_coap_parser_stub.c

@@ -12,7 +12,6 @@
  */
 
 #include "ns_types.h"
-#include "sn_nsdl.h"
 #include "sn_coap_protocol.h"
 #include "sn_coap_parser_stub.h"
 

test/coap-service/unittest/stub/sn_coap_protocol_stub.c

@@ -11,7 +11,6 @@
 #endif
 
 #include "ns_types.h"
-#include "sn_nsdl.h"
 #include "sn_coap_protocol.h"
 #include "sn_coap_header_internal.h"
 #include "sn_coap_protocol_internal.h"