FHSS unit tests: Fixed channel function variable name

cmonr · Sep 25, 2018 · 576f2bf · 576f2bf
1 parent f33d163
commit 576f2bf
Showing 1 changed file with 9 additions and 9 deletions.
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
@@ -301,7 +301,7 @@ bool test_fhss_ws_check_tx_conditions_callback()
  return false;
  }
  // Test broadcast destination on unicast channel
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  if (fhss_common_stub.fhss_struct.fhss_api->check_tx_conditions(api, true, DEFAULT_HANDLE, DEFAULT_FRAME_TYPE, DEFAULT_FRAME_LENGTH, DEFAULT_PHY_HEAD_LENGTH, DEFAULT_PHY_TAIL_LENGTH) != false) {
  return false;
  }
@@ -386,7 +386,7 @@ bool test_fhss_ws_data_tx_done_callback()
  // Test when FHSS struct can be found
  enable_fhss_struct();
  fhss_common_stub.fhss_struct.fhss_state = FHSS_SYNCHRONIZED;
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  fhss_common_stub.fhss_struct.fhss_api->data_tx_done(api, DEFAULT_WAITING_ACK, DEFAULT_TX_COMPLETED, DEFAULT_HANDLE);
 
  return true;
@@ -452,7 +452,7 @@ bool test_fhss_ws_synch_state_set_callback()
 bool test_fhss_ws_write_synch_info_callback()
 {
  fhss_api_t *api = test_generate_fhss_api();
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  fhss_common_stub.fhss_struct.rx_channel = 0;
  uint8_t synch_info[100] = {0x05, 0x15, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x15, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x3f};
  // Test when FHSS struct not found
@@ -561,28 +561,28 @@ bool test_fhss_ws_update_uc_channel_callback()
  return false;
  }
  // Test setting TR51 unicast channel
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
  if ((3 != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 0)) {
  return false;
  }
  // Test setting direct hash unicast channel
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_DH1CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_DH1CF;
  fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
  if ((1 != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 1)) {
  return false;
  }
  // Test setting vendor defined unicast channel
  fhss_common_stub.fhss_struct.ws->fhss_configuration.vendor_defined_cf = app_channel_function;
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_VENDOR_DEF_CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_VENDOR_DEF_CF;
  fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
  if ((VENDOR_CHANNEL != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 1)) {
  return false;
  }
  // Test changing unicast channel when broadcast channel is active
  api = test_generate_fhss_api();
  enable_fhss_struct();
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
  if ((3 != fhss_common_stub.fhss_struct.rx_channel) || (3 == fhss_callbacks_stub.uint8_value)) {
  return false;
@@ -597,7 +597,7 @@ bool test_fhss_unicast_handler()
  fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_bc_dwell_interval = 0;
  fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 0;
  fhss_common_stub.fhss_struct.ws->uc_slot = fhss_common_stub.fhss_struct.number_of_channels - 1;
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
 
  // Call state set just to get fhss_stub.callback
  enable_fhss_struct();
@@ -629,7 +629,7 @@ bool test_fhss_ws_set_parent()
  }
 
  // Test success
- fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
+ fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
  bc_timing_info.broadcast_channel_function = WS_TR51CF;
  bc_timing_info.broadcast_dwell_interval = 250;
  bc_timing_info.broadcast_interval = 1000;