Skip to content

Commit accdaf3

Browse files
author
Teppo Järvelin
committed
Cellular: review fixes and fixed unit tests.
1 parent 75c5e35 commit accdaf3

File tree

8 files changed

+56
-18
lines changed

8 files changed

+56
-18
lines changed

‎features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_access_technology()
195195
ATHandler at(&fh1, que, 0, ",");
196196

197197
AT_CellularNetwork cn(at);
198-
CHECK(NSAPI_ERROR_UNSUPPORTED == cn.set_access_technology(CellularNetwork::operator_t::RAT_UNKNOWN));
199-
CHECK(NSAPI_ERROR_UNSUPPORTED == cn.set_access_technology(CellularNetwork::operator_t::RAT_GSM_COMPACT));
198+
CHECK(NSAPI_ERROR_UNSUPPORTED == cn.set_access_technology(CellularNetwork::RAT_UNKNOWN));
199+
CHECK(NSAPI_ERROR_UNSUPPORTED == cn.set_access_technology(CellularNetwork::RAT_GSM_COMPACT));
200200
}
201201

202202
void Test_AT_CellularNetwork::test_AT_CellularNetwork_scan_plmn()

‎features/cellular/UNITTESTS/at/athandler/test_athandler.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ void Test_ATHandler::test_ATHandler_cmd_start()
287287
ATHandler at(&fh1, que, 0, ",");
288288
mbed_poll_stub::revents_value = POLLOUT;
289289
mbed_poll_stub::int_value = 1;
290-
fh1.size_value = 1;
290+
fh1.size_value = 3;
291291
at.cmd_start("s");
292292
mbed_poll_stub::revents_value = POLLIN;
293293
mbed_poll_stub::int_value = 0;
@@ -303,12 +303,13 @@ void Test_ATHandler::test_ATHandler_write_int()
303303
FileHandle_stub fh1;
304304

305305
ATHandler at(&fh1, que, 0, ",");
306+
fh1.size_value = -1;
306307
at.write_int(4);
307308

308309
at.clear_error();
309310
mbed_poll_stub::revents_value = POLLOUT;
310311
mbed_poll_stub::int_value = 1;
311-
fh1.size_value = 1;
312+
fh1.size_value = 6;
312313
at.write_int(4);
313314

314315
at.write_int(2147483647);
@@ -331,15 +332,15 @@ void Test_ATHandler::test_ATHandler_write_string()
331332
at.clear_error();
332333
mbed_poll_stub::revents_value = POLLOUT;
333334
mbed_poll_stub::int_value = 1;
334-
fh1.size_value = 1;
335+
fh1.size_value = -1;
335336
at.cmd_start("s");
336337
at.write_string("help", true);
337338
CHECK(NSAPI_ERROR_DEVICE_ERROR == at.get_last_error());
338339

339340
at.clear_error();
340341
mbed_poll_stub::revents_value = POLLOUT;
341342
mbed_poll_stub::int_value = 1;
342-
fh1.size_value = 3;
343+
fh1.size_value = -1;
343344
at.write_string("help", true);
344345
CHECK(NSAPI_ERROR_DEVICE_ERROR == at.get_last_error());
345346

@@ -357,6 +358,7 @@ void Test_ATHandler::test_ATHandler_cmd_stop()
357358
FileHandle_stub fh1;
358359

359360
ATHandler at(&fh1, que, 0, ",");
361+
fh1.size_value = -1;
360362
at.cmd_stop();
361363

362364
at.write_string("help", true);
@@ -371,6 +373,7 @@ void Test_ATHandler::test_ATHandler_write_bytes()
371373
FileHandle_stub fh1;
372374

373375
ATHandler at(&fh1, que, 0, ",");
376+
fh1.size_value = -1;
374377
uint8_t data[] = "data";
375378
at.write_bytes(data, 4);
376379

‎features/cellular/UNITTESTS/stubs/ATHandler_stub.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ void ATHandler::set_file_handle(FileHandle *fh)
7979
{
8080
}
8181

82-
void ATHandler::set_urc_handler(const char *urc, mbed::Callback<void()> cb)
82+
nsapi_error_t ATHandler::set_urc_handler(const char *urc, mbed::Callback<void()> cb)
8383
{
8484
ATHandler_stub::callback = cb;
85+
return NSAPI_ERROR_OK;
8586
}
8687

8788
nsapi_error_t ATHandler::get_last_error() const

‎features/cellular/UNITTESTS/stubs/AT_CellularNetwork_stub.cpp

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ AT_CellularNetwork::~AT_CellularNetwork()
3333
{
3434
}
3535

36+
nsapi_error_t AT_CellularNetwork::init()
37+
{
38+
return NSAPI_ERROR_OK;
39+
}
40+
3641
nsapi_error_t AT_CellularNetwork::set_credentials(const char *apn,
3742
const char *username, const char *password)
3843
{
@@ -56,6 +61,11 @@ nsapi_error_t AT_CellularNetwork::connect()
5661
return NSAPI_ERROR_OK;
5762
}
5863

64+
nsapi_error_t AT_CellularNetwork::activate_context()
65+
{
66+
return NSAPI_ERROR_OK;
67+
}
68+
5969
nsapi_error_t AT_CellularNetwork::open_data_channel()
6070
{
6171
return NSAPI_ERROR_OK;
@@ -100,11 +110,17 @@ nsapi_ip_stack_t AT_CellularNetwork::string_to_stack_type(const char* pdp_type)
100110
return IPV4_STACK;
101111
}
102112

103-
nsapi_error_t AT_CellularNetwork::set_registration_urc(bool urc_on)
113+
nsapi_error_t AT_CellularNetwork::set_registration_urc(RegistrationType type, bool urc_on)
104114
{
105115
return NSAPI_ERROR_OK;
106116
}
107117

118+
nsapi_error_t AT_CellularNetwork::get_network_registering_mode(NWRegisteringMode& mode)
119+
{
120+
mode = NWModeAutomatic;
121+
return NSAPI_ERROR_OK;
122+
}
123+
108124
nsapi_error_t AT_CellularNetwork::set_registration(const char *plmn)
109125
{
110126
return NSAPI_ERROR_OK;
@@ -171,13 +187,19 @@ void AT_CellularNetwork::urc_no_carrier()
171187

172188
}
173189

174-
nsapi_error_t AT_CellularNetwork::set_access_technology_impl(operator_t::RadioAccessTechnology opsAct)
190+
nsapi_error_t AT_CellularNetwork::set_access_technology_impl(RadioAccessTechnology opsAct)
191+
{
192+
return NSAPI_ERROR_OK;
193+
}
194+
195+
nsapi_error_t AT_CellularNetwork::set_access_technology(RadioAccessTechnology opAct)
175196
{
176197
return NSAPI_ERROR_OK;
177198
}
178199

179-
nsapi_error_t AT_CellularNetwork::set_access_technology(operator_t::RadioAccessTechnology opAct)
200+
nsapi_error_t AT_CellularNetwork::get_access_technology(RadioAccessTechnology& rat)
180201
{
202+
rat = RAT_CATM1;
181203
return NSAPI_ERROR_OK;
182204
}
183205

‎features/cellular/UNITTESTS/stubs/AT_CellularPower_stub.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,13 @@ nsapi_error_t AT_CellularPower::opt_receive_period(int mode, EDRXAccessTechnolog
6464
{
6565
return NSAPI_ERROR_OK;
6666
}
67+
68+
nsapi_error_t AT_CellularPower::set_device_ready_urc_cb(mbed::Callback<void()> callback)
69+
{
70+
return NSAPI_ERROR_OK;
71+
}
72+
73+
void AT_CellularPower::remove_device_ready_urc_cb(mbed::Callback<void()> callback){
74+
75+
}
76+

‎features/cellular/UNITTESTS/stubs/FileHandle_stub.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static uint8_t filehandle_stub_table_pos = 0;
2929
class FileHandle_stub : public FileHandle
3030
{
3131
public:
32-
size_t size_value;
32+
ssize_t size_value;
3333

3434
FileHandle_stub() {size_value = 0;}
3535

@@ -47,9 +47,11 @@ class FileHandle_stub : public FileHandle
4747
}
4848

4949
virtual ssize_t write(const void *buffer, size_t size){
50-
if( size_value ) {
50+
if (size_value > 0) {
5151
size_value--;
5252
return size;
53+
} else if (size_value < 0) {
54+
return -1;
5355
}
5456
return 0;
5557
}

‎features/cellular/easy_cellular/CellularConnectionFSM.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace mbed
4343
CellularConnectionFSM::CellularConnectionFSM() :
4444
_serial(0), _state(STATE_INIT), _next_state(_state), _status_callback(0), _event_status_cb(0), _network(0), _power(0), _sim(0),
4545
_queue(8 * EVENTS_EVENT_SIZE), _queue_thread(0), _cellularDevice(0), _retry_count(0), _event_timeout(-1),
46-
_at_queue(8 * EVENTS_EVENT_SIZE), _eventID(0)
46+
_at_queue(8 * EVENTS_EVENT_SIZE), _event_id(0)
4747
{
4848
memset(_sim_pin, 0, sizeof(_sim_pin));
4949
#if MBED_CONF_CELLULAR_RANDOM_MAX_START_DELAY == 0
@@ -528,8 +528,8 @@ void CellularConnectionFSM::event()
528528
if (_event_timeout == -1) {
529529
_event_timeout = 0;
530530
}
531-
_eventID = _queue.call_in(_event_timeout*1000, callback(this, &CellularConnectionFSM::event));
532-
if (!_eventID) {
531+
_event_id = _queue.call_in(_event_timeout*1000, callback(this, &CellularConnectionFSM::event));
532+
if (!_event_id) {
533533
report_failure("Cellular event failure!");
534534
return;
535535
}
@@ -576,7 +576,7 @@ void CellularConnectionFSM::network_callback(nsapi_event_t ev, intptr_t ptr)
576576
if ((cellular_connection_status_t)ev == CellularRegistrationStatusChanged && _state == STATE_REGISTERING_NETWORK) {
577577
// expect packet data so only these states are valid
578578
if (ptr == CellularNetwork::RegisteredHomeNetwork && CellularNetwork::RegisteredRoaming) {
579-
_queue.cancel(_eventID);
579+
_queue.cancel(_event_id);
580580
continue_from_state(STATE_ATTACHING_NETWORK);
581581
}
582582
}
@@ -591,7 +591,7 @@ void CellularConnectionFSM::ready_urc_cb()
591591
tr_debug("Device ready URC func called");
592592
if (_state == STATE_DEVICE_READY && _power->set_at_mode() == NSAPI_ERROR_OK) {
593593
tr_debug("State was STATE_DEVICE_READY and at mode ready, cancel state and move to next");
594-
_queue.cancel(_eventID);
594+
_queue.cancel(_event_id);
595595
if (device_ready()) {
596596
continue_from_state(STATE_SIM_PIN);
597597
}

‎features/cellular/easy_cellular/CellularConnectionFSM.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class CellularConnectionFSM
195195
int _retry_array_length;
196196
events::EventQueue _at_queue;
197197
char _st_string[20];
198-
int _eventID;
198+
int _event_id;
199199
};
200200

201201
} // namespace

0 commit comments

Comments
 (0)