FHSS unit test: Added FHSS common to unit test makefile

- Fixed failing tests

Author: Jarkko Paso

test/nanostack/unittest/service_libs/fhss/Makefile

@@ -5,6 +5,7 @@ COMPONENT_NAME = fhss_unit
 #This must be changed manually
 SRC_FILES = \
         ../../../../../source/Service_Libs/fhss/fhss.c \
+        ../../../../../source/Service_Libs/fhss/fhss_common.c \
 
 
 TEST_SRC_FILES = \

test/nanostack/unittest/service_libs/fhss/test_fhss.c

@@ -17,6 +17,7 @@
 #include "nsconfig.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 #include "MAC/IEEE802_15_4/mac_fhss_callbacks.h"

test/nanostack/unittest/service_libs/fhss_beacon/test_fhss_beacon.c

@@ -17,6 +17,7 @@
 #include "nsconfig.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 

test/nanostack/unittest/service_libs/fhss_beacon_tasklet/test_fhss_beacon_tasklet.c

@@ -17,6 +17,7 @@
 #include "nsconfig.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 #include "MAC/IEEE802_15_4/mac_fhss_callbacks.h"

test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c

@@ -17,6 +17,7 @@
 #include "nsconfig.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "MAC/IEEE802_15_4/mac_fhss_callbacks.h"
 #include "test_fhss_channel.h"
@@ -387,6 +388,8 @@ bool test_fhss_change_to_tx_channel()
 {
     uint8_t destination_address[8] = {0, 0, 0, 0, 0, 0, 0 , 1};
     fhss_structure_t fhss_struct;
+    // Must allocate scramble stable
+    fhss_struct.fhss_scramble_table = malloc(20);
     fhss_struct.number_of_channels = 50;
     fhss_struct.synch_configuration.fhss_number_of_bc_channels = 10;
     fhss_struct.rx_channel = 10;
@@ -412,6 +415,7 @@ bool test_fhss_change_to_tx_channel()
     if (fhss_callbacks_stub.uint8_value != 20) {
         return false;
     }
+    free(fhss_struct.fhss_scramble_table);
     return true;
 }
 

test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.c

@@ -19,6 +19,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "net_fhss.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "test_fhss_config.h"
 #include "nsdynmemLIB_stub.h"

test/nanostack/unittest/service_libs/fhss_mac_interface/test_fhss_mac_interface.c

@@ -19,6 +19,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "net_fhss.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_mac_interface.h"
 #include "MAC/IEEE802_15_4/mac_fhss_callbacks.h"

test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c

@@ -19,6 +19,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "net_fhss.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_statistics.h"
 

test/nanostack/unittest/stub/fhss_beacon_stub.c

@@ -20,6 +20,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "fhss_channel_stub.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 

test/nanostack/unittest/stub/fhss_beacon_tasklet_stub.c

@@ -21,6 +21,7 @@
 #include "fhss_config.h"
 #include "fhss_channel_stub.h"
 #include "fhss_beacon_tasklet_stub.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 
 fhss_beacon_tasklet_stub_def fhss_beacon_tasklet_stub;

test/nanostack/unittest/stub/fhss_channel_stub.c

@@ -20,6 +20,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "fhss_channel_stub.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 
 fhss_channel_stub_def fhss_channel_stub;

test/nanostack/unittest/stub/fhss_statistics_stub.c

@@ -19,6 +19,7 @@
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "fhss_channel_stub.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_statistics.h"
 

test/nanostack/unittest/stub/fhss_stub.c

@@ -19,6 +19,7 @@
 #include "nsdynmemLIB.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
+#include "Service_Libs/fhss/fhss_common.h"
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 #include "fhss_stub.h"