Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit b5f9e01

Browse files
author
Jarkko Paso
committed
FHSS unit tests: Fixed after FHSS enable/down updates
1 parent 2cbe6dc commit b5f9e01

File tree

5 files changed

+5
-32
lines changed

5 files changed

+5
-32
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ TEST(fhss, test_fhss_timeout_start)
3939
CHECK(test_fhss_timeout_start());
4040
}
4141

42-
TEST(fhss, test_fhss_down)
43-
{
44-
CHECK(test_fhss_down());
45-
}
46-
4742
TEST(fhss, test_fhss_event_timer_cb)
4843
{
4944
CHECK(test_fhss_event_timer_cb());

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -560,26 +560,6 @@ bool test_fhss_event_timer_cb()
560560
return true;
561561
}
562562

563-
bool test_fhss_down()
564-
{
565-
fhss_struct = malloc(sizeof(fhss_structure_t));
566-
fhss_struct->platform_functions.fhss_timer_stop = &fhss_timer_stop_stub;
567-
fhss_struct->fhss_beacon_info_store = NULL;
568-
fhss_struct->fhss_scramble_table = malloc(20);
569-
ns_list_init(&fhss_struct->fhss_failed_tx_list);
570-
// Test without FHSS
571-
if (fhss_down(NULL) == 0) {
572-
return false;
573-
}
574-
// Test with proper FHSS struct
575-
if (fhss_down(fhss_struct) != 0) {
576-
return false;
577-
}
578-
free(fhss_struct);
579-
fhss_struct = NULL;
580-
return true;
581-
}
582-
583563
bool test_fhss_timeout_start()
584564
{
585565
uint32_t time = 1000;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ bool test_fhss_update_synch_parent_address();
4545
bool test_fhss_superframe_handler();
4646
// Test event timer callback
4747
bool test_fhss_event_timer_cb();
48-
// Test FHSS down
49-
bool test_fhss_down();
5048
// Test starting FHSS timeout
5149
bool test_fhss_timeout_start();
5250
// Test stopping FHSS timeout

test/nanostack/unittest/stub/fhss_stub.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ int fhss_update_synch_parent_address(fhss_structure_t *fhss_structure)
108108
return 0;
109109
}
110110

111-
int fhss_down(fhss_structure_t *fhss_structure)
112-
{
113-
return 0;
114-
}
115-
116111
fhss_failed_tx_t *fhss_failed_handle_find(fhss_structure_t *fhss_structure, uint8_t handle)
117112
{
118113
if (fhss_stub.fhss_failed_tx.handle == handle) {

test/nanostack/unittest/stub/fhss_ws_stub.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure)
2727
{
2828

2929
}
30+
31+
fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer)
32+
{
33+
return NULL;
34+
}

0 commit comments

Comments
 (0)