Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cellular: CellularDevice unittests fix initialization #7894

Merged
merged 2 commits into from Sep 2, 2018
Merged

Cellular: CellularDevice unittests fix initialization #7894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb75d2
Cellular: fixed CellularDevice unittests by doing proper initializati…
Aug 27, 2018
5e69888
Cellular: review fix removed magic numbers from unit tests.
Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 19 additions & 7 deletions features/cellular/UNITTESTS/at/at_cellulardevice/test_at_cellulardevice.cpp
View file
Open in desktop
Expand Up @@ -118,10 +118,11 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_network()
ATHandler_stub::ref_count = 0;

CHECK(dev.open_network(&fh1));
AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
CHECK(ATHandler_stub::ref_count == 1);

dev.close_network();
CHECK(ATHandler_stub::ref_count == 0);
CHECK(ATHandler_stub::ref_count == kATHandler_destructor_ref_ount);
}

void Test_AT_CellularDevice::test_AT_CellularDevice_close_sms()
Expand All @@ -132,10 +133,11 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_sms()
ATHandler_stub::ref_count = 0;

CHECK(dev.open_sms(&fh1));
AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
CHECK(ATHandler_stub::ref_count == 1);

dev.close_sms();
CHECK(ATHandler_stub::ref_count == 0);
CHECK(ATHandler_stub::ref_count == kATHandler_destructor_ref_ount);
}

void Test_AT_CellularDevice::test_AT_CellularDevice_close_power()
Expand All @@ -146,10 +148,11 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_power()
ATHandler_stub::ref_count = 0;

CHECK(dev.open_power(&fh1));
AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
CHECK(ATHandler_stub::ref_count == 1);

dev.close_power();
CHECK(ATHandler_stub::ref_count == 0);
CHECK(ATHandler_stub::ref_count == kATHandler_destructor_ref_ount);
}

void Test_AT_CellularDevice::test_AT_CellularDevice_close_sim()
Expand All @@ -161,11 +164,13 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_sim()


CHECK(dev.open_sim(&fh1));
AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;

dev.close_sms(); // this should not affect to refcount as it's not opened
CHECK(ATHandler_stub::ref_count == 1);

dev.close_sim();
CHECK(ATHandler_stub::ref_count == 0);
CHECK(ATHandler_stub::ref_count == kATHandler_destructor_ref_ount);
}

void Test_AT_CellularDevice::test_AT_CellularDevice_close_information()
Expand All @@ -174,21 +179,28 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_information()
AT_CellularDevice dev(que);
FileHandle_stub fh1;
ATHandler_stub::int_value = 0;
ATHandler_stub::ref_count = 0;
ATHandler_stub::fh_value = NULL;
AT_CellularBase_stub::handler_value = NULL;

CHECK(dev.open_information(&fh1));
CHECK(ATHandler_stub::ref_count == 1);

ATHandler_stub::fh_value = NULL;
AT_CellularBase_stub::handler_value = NULL;
// at handler is not found as it's NULL (e.g. AT_CellularBase_stub::handler_value is NULL)
dev.close_information();
CHECK(ATHandler_stub::ref_count == 1);

// same filehandle but different at
ATHandler_stub::fh_value = &fh1;
ATHandler at(&fh1, que, 0, ",");
AT_CellularBase_stub::handler_value = &at;

CHECK(dev.open_information(&fh1));
AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
// refcount is two it's one when we create athandler and then in open_information it's incremented by one
CHECK(ATHandler_stub::ref_count == 2);

dev.close_information();
CHECK(ATHandler_stub::ref_count == 1);

ATHandler_stub::fh_value = NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion features/cellular/UNITTESTS/stubs/ATHandler_stub.cpp
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ void ATHandler::set_debug(bool debug_on)

ATHandler::~ATHandler()
{
ATHandler_stub::ref_count = -909;
ATHandler_stub::ref_count = kATHandler_destructor_ref_ount;
}

void ATHandler::inc_ref_count()
Expand Down
2 changes: 2 additions & 0 deletions features/cellular/UNITTESTS/stubs/ATHandler_stub.h
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
static const int kRead_string_table_size = 100;
static const int kRead_int_table_size = 100;
static const int kResp_stop_count_default = 100;
// set reference count to -909 to separate it from zero so we can test that ATHandler is really deleted.
static const int kATHandler_destructor_ref_ount = -909;

namespace ATHandler_stub {
extern nsapi_error_t nsapi_error_value;
Expand Down