Fixed unit test and stubs

Fixed missing ws_neighbour_class stub's

Fixed mac_neighbour_table function stubs

Author: Juha Heiskanen

test/nanostack/unittest/6LoWPAN/ws_llc_data_service/Makefile

@@ -29,6 +29,8 @@ TEST_SRC_FILES = \
         ../../stub/mac_ie_lib_stub.c \
         ../../stub/ws_ie_lib_stub.c \
         ../../stub/ws_mpx_header_stub.c \
+        ../../stub/ws_neighbour_class_stub.c \
+        ../../stub/mac_neighbor_table_stub.c \
         ../../stub/iphc_decompress_stub.c \
 
 

test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c

@@ -28,20 +28,27 @@
 #include "6LoWPAN/MAC/mpx_api.h"
 #include "6LoWPAN/MAC/mac_ie_lib.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_ie_lib.h"
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
-#include "6LoWPAN/lowpan_adaptation_interface.h"
+#include "6LoWPAN/ws/ws_neighbour_class.h"
+#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 #include "nsdynmemLIB_stub.h"
 #include "mac_ie_lib_stub.h"
 #include "ws_mpx_header_stub.h"
+#include "ws_mpx_header_stub.h"
+#include "mac_neighbor_table_stub.h"
+#include "ws_neighbour_class_stub.h"
 
 static mcps_data_indication_ext *data_indication_cb;
 
 static mcps_data_confirm_ext *data_confirmation_cb;
 
 static protocol_interface_info_entry_t interface;
 
+static arm_15_4_mac_parameters_t mac_parameters;
+
 
 static uint8_t async_ind_type;
 static uint16_t async_data_length;
@@ -111,7 +118,9 @@ static void test_mcps_purge_request(const mac_api_t* api, const mcps_purge_t *da
 static void interface_api_init(mac_api_t *api)
 {
     memset(&interface, 0, sizeof(protocol_interface_info_entry_t));
+    memset(&mac_parameters, 0, sizeof(arm_15_4_mac_parameters_t));
     interface.mac_api = api;
+    interface.mac_parameters = &mac_parameters;
     api->mcps_purge_req = &test_mcps_purge_request;
     api->mcps_data_req_ext = &test_mcps_data_request_ext;
     api->mac_mcps_extension_enable = &test_mac_api_enable_mcps_ext;
@@ -378,6 +387,9 @@ bool test_mpx_msg_rx()
     ie_ext.payloadIeList = payload_buf;
     ie_ext.payloadIeListLength = 100;
 
+    ws_neighbor_stub.neigh_entry = NULL;
+    mac_neighbor_table_stub.test_neigh = NULL;
+
     mac_ie_lib_stub_def.value_uint8 = 0;
 
     data_indication_cb(NULL, &data_ind, &ie_ext);

test/nanostack/unittest/stub/common_functions_stub.c

@@ -97,6 +97,12 @@ COMMON_FUNCTIONS_FN uint_fast24_t common_read_24_bit(const uint8_t data_buf[__st
     return common_functions_stub.uint24_value;
 }
 
+COMMON_FUNCTIONS_FN uint_fast24_t common_read_24_bit_inverse(const uint8_t data_buf[__static 3])
+{
+    memcpy(common_functions_stub.argument_table, data_buf, 3);
+    return common_functions_stub.uint24_value;
+}
+
 COMMON_FUNCTIONS_FN uint8_t *common_write_24_bit_inverse(uint_fast24_t value, uint8_t ptr[__static 3])
 {
     return ptr + 3;

test/nanostack/unittest/stub/mac_neighbor_table_stub.c

@@ -61,12 +61,12 @@ void mac_neighbor_table_neighbor_remove(mac_neighbor_table_t *table_class, mac_n
 }
 
 
-void neighbor_table_class_neighbor_refresh(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry, uint32_t life_time)
+void mac_neighbor_table_neighbor_refresh(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry, uint32_t life_time)
 {
 
 }
 
-void neighbor_table_class_neighbor_connected(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry)
+void mac_neighbor_table_neighbor_connected(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry)
 {
 
 }
@@ -77,12 +77,12 @@ void mac_neighbor_table_trusted_neighbor(mac_neighbor_table_t *table_class, mac_
 }
 
 
-mac_neighbor_table_entry_t *neighbor_table_class_address_discover(mac_neighbor_table_t *table_class, const uint8_t *address, uint8_t address_type)
+mac_neighbor_table_entry_t *mac_neighbor_table_address_discover(mac_neighbor_table_t *table_class, const uint8_t *address, uint8_t address_type)
 {
     return mac_neighbor_table_stub.test_neigh;
 }
 
-mac_neighbor_table_entry_t *neighbor_table_class_attribute_discover(mac_neighbor_table_t *table_class, uint8_t index)
+mac_neighbor_table_entry_t *mac_neighbor_table_attribute_discover(mac_neighbor_table_t *table_class, uint8_t index)
 {
     return mac_neighbor_table_stub.test_neigh;
 }

test/nanostack/unittest/stub/ws_neighbour_class_stub.c

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "nsconfig.h"
+#include <string.h>
+#include "ns_types.h"
+#include "ns_list.h"
+#include "ns_trace.h"
+#include "nsdynmemLIB.h"
+#include "6LoWPAN/ws/ws_neighbour_class.h"
+#include "ws_neighbour_class_stub.h"
+
+ws_neighbor_stub_def ws_neighbor_stub;
+
+bool ws_neighbour_class_alloc(ws_neighbour_class_t *class_data, uint8_t list_size)
+{
+    return ws_neighbor_stub.bool_value;
+}
+
+
+void ws_neighbour_class_dealloc(ws_neighbour_class_t *class_data)
+{
+
+}
+
+ws_neighbour_class_entry_t * ws_neighbour_class_entry_get(ws_neighbour_class_t *class_data, uint8_t attribute_index)
+{
+    return ws_neighbor_stub.neigh_entry;
+}
+
+void ws_neighbour_class_entry_remove(ws_neighbour_class_t *class_data, uint8_t attribute_index)
+{
+
+}

test/nanostack/unittest/stub/ws_neighbour_class_stub.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WS_NEIGHBOUR_CLASS_STUB_H_
+#define WS_NEIGHBOUR_CLASS_STUB_H_
+
+#include "inttypes.h"
+
+#include "6LoWPAN/ws/ws_neighbour_class.h"
+
+
+typedef struct {
+    ws_neighbour_class_entry_t *neigh_entry;
+    bool bool_value;
+} ws_neighbor_stub_def;
+
+extern ws_neighbor_stub_def ws_neighbor_stub;
+
+
+
+#endif /* WS_NEIGHBOUR_CLASS_STUB_H_ */