From a1d8b3d39c0608433806e9fd3a6965fac1d50409 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Fri, 26 Oct 2018 14:32:10 +0300
Subject: [PATCH] FHSS unit tests: Fixed tr51 tests

---
 .../channel_functions/test_channel_functions.c        | 11 ++++++++---
 .../unittest/service_libs/fhss_ws/test_fhss_ws.c      |  3 ++-
 test/nanostack/unittest/stub/channel_functions_stub.c |  9 +++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
index 843fafc085a..25b00a562ad 100644
--- a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
+++ b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
@@ -86,10 +86,13 @@ bool test_tr51_get_uc_channel_index()
     int i;
     uint16_t number_of_channels = 129;
     int32_t channel;
+    int16_t channel_table[number_of_channels];
     int32_t test_table[number_of_channels];
     uint8_t mac[8] = {0x00, 0x13, 0x50, 0x04, 0x00, 0x00, 0x05, 0xf8};
+
+    tr51_init_channel_table(channel_table, number_of_channels);
     for (i=0; i<number_of_channels; i++) {
-        test_table[i] = channel = tr51_get_uc_channel_index(i, mac, number_of_channels, NULL);
+        test_table[i] = channel = tr51_get_uc_channel_index(channel_table, i, mac, number_of_channels, NULL);
 // Not sure yet which one is correct since there might be bug in spec
 //        if (channel != test_HopSequenceTable[i]) {
         if (channel != test_HopSequenceTable2[i]) {
@@ -114,7 +117,7 @@ bool test_tr51_get_uc_channel_index()
     uint32_t excluded_channels[8] = {0x40100401, 0x10040100, 0x04010040, 0, 0, 0, 0, 0};
     uint16_t number_of_excluded_channels = 10;
     for (i=0; i<number_of_channels-number_of_excluded_channels; i++) {
-            test_table[i] = channel = tr51_get_uc_channel_index(i, mac, number_of_channels, excluded_channels);
+            test_table[i] = channel = tr51_get_uc_channel_index(channel_table, i, mac, number_of_channels, excluded_channels);
             // Shouldn't find channel from excluded channels
             if (channel_on_the_list(excluded_channels, channel)) {
                 return false;
@@ -137,8 +140,10 @@ bool test_tr51_get_bc_channel_index()
     int32_t channel;
     uint16_t bsi = 100;
     int32_t test_table[number_of_channels];
+    int16_t channel_table[number_of_channels];
+    tr51_init_channel_table(channel_table, number_of_channels);
     for (int i=0; i<number_of_channels; i++) {
-        test_table[i] = channel = tr51_get_bc_channel_index(i, bsi, number_of_channels, NULL);
+        test_table[i] = channel = tr51_get_bc_channel_index(channel_table, i, bsi, number_of_channels, NULL);
         if (channel != test_HopSequenceTable3[i]) {
             return false;
         }
diff --git a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
index 2e0264d336e..1f7d62cb4cc 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
+++ b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
@@ -179,10 +179,11 @@ bool test_fhss_ws_enable()
         return false;
     }
     // Test success
-    nsdynmemlib_stub.returnCounter = 1;
+    nsdynmemlib_stub.returnCounter = 2;
     if (fhss_ws_enable(&fhss_api, &fhss_configuration, &fhss_timer) == NULL) {
         return false;
     }
+    free(fhss_common_stub.fhss_struct.ws->tr51_channel_table);
     free(fhss_common_stub.fhss_struct.ws);
     return true;
 }
diff --git a/test/nanostack/unittest/stub/channel_functions_stub.c b/test/nanostack/unittest/stub/channel_functions_stub.c
index 6c2bde5bdce..2495bf3ab73 100644
--- a/test/nanostack/unittest/stub/channel_functions_stub.c
+++ b/test/nanostack/unittest/stub/channel_functions_stub.c
@@ -30,13 +30,18 @@ int32_t dh1cf_get_bc_channel_index(uint16_t slot_number, uint16_t bsi, int16_t n
     return 2;
 }
 
-int32_t tr51_get_uc_channel_index(uint16_t slot_number, uint8_t *mac, int16_t number_of_channels)
+int tr51_init_channel_table(int16_t *channel_table, int16_t number_of_channels)
+{
+    return 0;
+}
+
+int32_t tr51_get_uc_channel_index(int16_t *channel_table, uint16_t slot_number, uint8_t *mac, int16_t number_of_channels)
 {
     channel_functions_stub.uint8_value = slot_number;
     return 3;
 }
 
-int32_t tr51_get_bc_channel_index(uint16_t slot_number, uint16_t bsi, int16_t number_of_channels)
+int32_t tr51_get_bc_channel_index(int16_t *channel_table, uint16_t slot_number, uint16_t bsi, int16_t number_of_channels)
 {
     return 4;
 }