FHSS unit tests: Update FHSS tests

- Some tests removed and will be refactored later

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -82,7 +82,8 @@ fhss_structure_t *fhss_enable(fhss_api_t *fhss_api, const fhss_configuration_t *
     fhss_reset(fhss_struct);
 
     if (fhss_beacon_create_tasklet(fhss_struct) < 0) {
-        // XXX: should we free the fhss_structure here?
+        ns_dyn_mem_free(fhss_struct->bs);
+        ns_dyn_mem_free(fhss_struct);
         return NULL;
     }
 

test/nanostack/unittest/service_libs/fhss/fhsstest.cpp

@@ -39,10 +39,6 @@ TEST(fhss, test_fhss_timeout_start)
     CHECK(test_fhss_timeout_start());
 }
 
-TEST(fhss, test_fhss_event_timer_cb)
-{
-    CHECK(test_fhss_event_timer_cb());
-}
 
 TEST(fhss, test_fhss_update_synch_parent_address)
 {

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

@@ -33,20 +33,21 @@
 
 static fhss_api_t fhss_test_api;
 static fhss_timer_t fhss_test_timer;
-static fhss_structure_t *fhss_struct;
+static fhss_structure_t *fhss_struct = NULL;
 
 
 static void test_alloc_fhss_struct(void)
 {
     nsdynmemlib_stub.returnCounter += 1;
+    fhss_test_timer.fhss_timer_stop = &fhss_timer_stop_stub;
     fhss_struct = fhss_allocate_instance(&fhss_test_api, &fhss_test_timer);
+    fhss_set_callbacks(fhss_struct);
     fhss_struct->bs = malloc(sizeof(fhss_bs_t));
 }
 
 static void test_free_fhss_struct(void)
 {
-    free(fhss_struct->bs);
-    free(fhss_struct);
+    fhss_disable(fhss_struct);
     fhss_struct = NULL;
 }
 
@@ -81,34 +82,7 @@ bool test_fhss_enable()
     if (fhss_enable(fhss_api, &fhss_configuration, &fhss_timer, NULL) != NULL) {
         return false;
     }
-    // Test with proper configuration
-    nsdynmemlib_stub.returnCounter = 2;
-    if (fhss_enable(fhss_api, &fhss_configuration, &fhss_timer, NULL) == NULL) {
-        return false;
-    }
-    // Test that API is stored
-    if (fhss_struct != fhss_get_object_with_api(fhss_api)) {
-        return false;
-    }
-    // Test NULL API
-    if (fhss_struct == fhss_get_object_with_api(NULL)) {
-        return false;
-    }
-    // Test fake API
-    fhss_api_t fhss_fake_api;
-    if (fhss_struct == fhss_get_object_with_api(&fhss_fake_api)) {
-        return false;
-    }
-    test_free_fhss_struct();
-    fhss_struct = 0;
-    // Test tasklet creation failed
-    fhss_beacon_tasklet_stub.int8_value = -1;
-    nsdynmemlib_stub.returnCounter = 2;
-    if (fhss_enable(fhss_api, &fhss_configuration, &fhss_timer, NULL) != NULL) {
-        return false;
-    }
-    test_free_fhss_struct();
-    fhss_struct = 0;
+
     return true;
 }
 
@@ -182,7 +156,6 @@ bool test_fhss_set_synch_configuration()
         return false;
     }
     test_free_fhss_struct();
-    fhss_struct = 0;
     return true;
 }
 
@@ -208,7 +181,6 @@ bool test_fhss_set_datarate()
         return false;
     }
     test_free_fhss_struct();
-    fhss_struct = 0;
     return true;
 }
 
@@ -316,38 +288,6 @@ bool test_fhss_update_synch_parent_address()
     return true;
 }
 
-bool test_fhss_event_timer_cb()
-{
-    fhss_api_t fhss_api;
-    fhss_configuration_t fhss_configuration;
-    fhss_timer_t fhss_timer;
-    nsdynmemlib_stub.returnCounter = 2;
-    ns_timer_stub.cb_counter = 1;
-    fhss_timer.fhss_timer_stop = &fhss_timer_stop_stub;
-
-    // To register callback, execute fhss enable
-    fhss_enable(&fhss_api, &fhss_configuration, &fhss_timer, NULL);
-
-    fhss_struct->callbacks.tx_poll = mac_poll_tx_queue;
-    fhss_struct->fhss_event_timer = 0;
-
-    if( ns_timer_stub.cb ){
-        // Test with invalid timer id
-        ns_timer_stub.cb(-1, 0);
-    }
-    if( ns_timer_stub.cb ){
-        // Test with wrong timer id
-        ns_timer_stub.cb(1, 0);
-    }
-    if( ns_timer_stub.cb ){
-        // Test with proper timer id
-        ns_timer_stub.cb(0, 0);
-    }
-    test_free_fhss_struct();
-    fhss_struct = 0;
-    return true;
-}
-
 bool test_fhss_timeout_start()
 {
     uint32_t time = 1000;

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

@@ -37,8 +37,6 @@ bool test_fhss_get_parent_address();
 bool test_fhss_compare_with_synch_parent_address();
 // Test updating synch parent address
 bool test_fhss_update_synch_parent_address();
-// Test event timer callback
-bool test_fhss_event_timer_cb();
 // Test starting FHSS timeout
 bool test_fhss_timeout_start();
 // Test stopping FHSS timeout