Skip to content

Commit a57bacf

Browse files
author
Cruz Monrreal
authored
Merge pull request #8901 from AriParkkila/cell-refactor-power-api
Cell refactor power api
2 parents 60fe3c5 + d09ee0d commit a57bacf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+559
-643
lines changed

‎UNITTESTS/features/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp

Lines changed: 71 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,18 +222,71 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_modem_debug_on)
222222
dev.close_sms();
223223
}
224224

225-
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_send_delay)
225+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_init)
226226
{
227227
FileHandle_stub fh1;
228228
AT_CellularDevice dev(&fh1);
229-
EXPECT_TRUE(0 == dev.get_send_delay());
229+
EXPECT_EQ(dev.init(), NSAPI_ERROR_OK);
230+
}
231+
232+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_reset)
233+
{
234+
FileHandle_stub fh1;
235+
AT_CellularDevice dev(&fh1);
236+
EXPECT_EQ(dev.reset(), NSAPI_ERROR_OK);
230237
}
231238

232-
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_init_module)
239+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_shutdown)
233240
{
234241
FileHandle_stub fh1;
235242
AT_CellularDevice dev(&fh1);
236-
EXPECT_TRUE(NSAPI_ERROR_OK == dev.init_module());
243+
EXPECT_EQ(dev.shutdown(), NSAPI_ERROR_OK);
244+
}
245+
246+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_is_ready)
247+
{
248+
EventQueue que;
249+
FileHandle_stub fh1;
250+
ATHandler at(&fh1, que, 0, ",");
251+
252+
AT_CellularDevice dev(&fh1);
253+
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
254+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.is_ready());
255+
}
256+
257+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_set_power_save_mode)
258+
{
259+
EventQueue que;
260+
FileHandle_stub fh1;
261+
ATHandler at(&fh1, que, 0, ",");
262+
263+
AT_CellularDevice dev(&fh1);
264+
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
265+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(0, 0));
266+
267+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(10, 0));
268+
269+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(912, 0));
270+
271+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(1834, 1834));
272+
273+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(18345, 18345));
274+
275+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(101234, 101234));
276+
277+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(1012345, 1012345));
278+
279+
EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(39612345, 39612345));
280+
281+
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
282+
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == dev.set_power_save_mode(0));
283+
}
284+
285+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_send_delay)
286+
{
287+
FileHandle_stub fh1;
288+
AT_CellularDevice dev(&fh1);
289+
EXPECT_TRUE(0 == dev.get_send_delay());
237290
}
238291

239292
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_create_delete_context)
@@ -333,3 +386,17 @@ TEST_F(TestAT_CellularDevice, TestAT_CellularDevice_get_sim_state)
333386

334387
delete dev;
335388
}
389+
390+
static void device_ready_cb()
391+
{
392+
}
393+
394+
TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_set_ready_cb)
395+
{
396+
EventQueue que;
397+
FileHandle_stub fh1;
398+
AT_CellularDevice *dev = new AT_CellularDevice(&fh1);
399+
400+
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == dev->set_ready_cb(&device_ready_cb));
401+
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == dev->set_ready_cb(0));
402+
}

‎UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,3 +681,16 @@ TEST_F(TestAT_CellularNetwork, test_get_connection_status)
681681
EXPECT_TRUE(NSAPI_STATUS_DISCONNECTED == cn.get_connection_status());
682682
}
683683

684+
TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_set_receive_period)
685+
{
686+
EventQueue que;
687+
FileHandle_stub fh1;
688+
ATHandler at(&fh1, que, 0, ",");
689+
690+
AT_CellularNetwork cn(at);
691+
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
692+
EXPECT_TRUE(NSAPI_ERROR_OK == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
693+
694+
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
695+
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
696+
}

‎UNITTESTS/features/cellular/framework/AT/at_cellularpower/at_cellularpowertest.cpp

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ class TestAT_CellularPower : public testing::Test {
4141
// *INDENT-ON*
4242

4343

44-
static void device_ready_cb()
45-
{
46-
}
47-
4844
TEST_F(TestAT_CellularPower, Create)
4945
{
5046

@@ -78,124 +74,3 @@ TEST_F(TestAT_CellularPower, test_AT_CellularPower_off)
7874
AT_CellularPower pow(at);
7975
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.off());
8076
}
81-
82-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_at_mode)
83-
{
84-
EventQueue que;
85-
FileHandle_stub fh1;
86-
ATHandler at(&fh1, que, 0, ",");
87-
88-
AT_CellularPower pow(at);
89-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
90-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_at_mode());
91-
92-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
93-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.set_at_mode());
94-
}
95-
96-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_power_level)
97-
{
98-
EventQueue que;
99-
FileHandle_stub fh1;
100-
ATHandler at(&fh1, que, 0, ",");
101-
102-
AT_CellularPower pow(at);
103-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
104-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(6));
105-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(1, 1));
106-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(1, 0));
107-
108-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
109-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.set_power_level(6));
110-
}
111-
112-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_reset)
113-
{
114-
EventQueue que;
115-
FileHandle_stub fh1;
116-
ATHandler at(&fh1, que, 0, ",");
117-
118-
AT_CellularPower pow(at);
119-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
120-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.reset());
121-
122-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
123-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.reset());
124-
}
125-
126-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_power_save_mode)
127-
{
128-
EventQueue que;
129-
FileHandle_stub fh1;
130-
ATHandler at(&fh1, que, 0, ",");
131-
132-
AT_CellularPower pow(at);
133-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
134-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(0, 0));
135-
136-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(10, 0));
137-
138-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(912, 0));
139-
140-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(1834, 1834));
141-
142-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(18345, 18345));
143-
144-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(101234, 101234));
145-
146-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(1012345, 1012345));
147-
148-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(39612345, 39612345));
149-
150-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
151-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_power_save_mode(0, 0));
152-
}
153-
154-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_receive_period)
155-
{
156-
EventQueue que;
157-
FileHandle_stub fh1;
158-
ATHandler at(&fh1, que, 0, ",");
159-
160-
AT_CellularPower pow(at);
161-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
162-
EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
163-
164-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
165-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
166-
}
167-
168-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_is_device_ready)
169-
{
170-
EventQueue que;
171-
FileHandle_stub fh1;
172-
ATHandler at(&fh1, que, 0, ",");
173-
174-
AT_CellularPower pow(at);
175-
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_AUTH_FAILURE;
176-
EXPECT_TRUE(NSAPI_ERROR_AUTH_FAILURE == pow.is_device_ready());
177-
}
178-
179-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_device_ready_urc_cb)
180-
{
181-
EventQueue que;
182-
FileHandle_stub fh1;
183-
ATHandler at(&fh1, que, 0, ",");
184-
185-
AT_CellularPower pow(at);
186-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(&device_ready_cb));
187-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(NULL));
188-
}
189-
190-
TEST_F(TestAT_CellularPower, test_AT_CellularPower_remove_device_ready_urc_cb)
191-
{
192-
EventQueue que;
193-
FileHandle_stub fh1;
194-
ATHandler at(&fh1, que, 0, ",");
195-
196-
AT_CellularPower pow(at);
197-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(&device_ready_cb));
198-
199-
pow.remove_device_ready_urc_cb(NULL);
200-
pow.remove_device_ready_urc_cb(&device_ready_cb);
201-
}

‎UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ TEST_F(TestATHandler, test_ATHandler_remove_urc_handler)
142142
mbed::Callback<void()> cb(&urc_callback);
143143
at.set_urc_handler(ch, cb);
144144

145-
//This does nothing!!!
146-
at.remove_urc_handler(ch);
145+
at.set_urc_handler(ch, 0);
147146
}
148147

149148
TEST_F(TestATHandler, test_ATHandler_get_last_error)
@@ -964,10 +963,10 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
964963
filehandle_stub_table = table9;
965964
filehandle_stub_table_pos = 0;
966965

966+
at.set_urc_handler("urc: ", &urc_callback);
967967
at.set_urc_handler("urc: ", NULL);
968968
at.resp_start();
969-
// Match URC consumes to CRLF -> nothing to read after that -> ERROR
970-
EXPECT_TRUE(at.get_last_error() == NSAPI_ERROR_DEVICE_ERROR);
969+
EXPECT_EQ(at.get_last_error(), NSAPI_ERROR_OK);
971970

972971
char table10[] = "urc: info\r\ngarbage\r\nprefix: info\r\nOK\r\n\0";
973972
at.flush();

‎UNITTESTS/features/cellular/framework/device/cellulardevice/cellulardevicetest.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,15 @@ TEST_F(TestCellularDevice, test_cellular_callback)
228228

229229
delete dev;
230230
}
231+
232+
TEST_F(TestCellularDevice, test_shutdown)
233+
{
234+
FileHandle_stub fh1;
235+
CellularDevice *dev = new myCellularDevice(&fh1);
236+
EXPECT_TRUE(dev);
237+
238+
CellularStateMachine_stub::nsapi_error_value = NSAPI_ERROR_OK;
239+
ASSERT_EQ(dev->shutdown(), NSAPI_ERROR_OK);
240+
241+
delete dev;
242+
}

‎UNITTESTS/stubs/AT_CellularDevice_stub.cpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ AT_CellularDevice::AT_CellularDevice(FileHandle *fh) : CellularDevice(fh), _netw
2828
_modem_debug_on(false)
2929
{
3030
_atHandlers = new ATHandler(fh, _queue, 0, ",");
31+
_at = _atHandlers;
3132
}
3233

3334
AT_CellularDevice::~AT_CellularDevice()
@@ -143,7 +144,32 @@ void AT_CellularDevice::modem_debug_on(bool on)
143144

144145
}
145146

146-
nsapi_error_t AT_CellularDevice::init_module()
147+
nsapi_error_t AT_CellularDevice::is_ready()
148+
{
149+
return NSAPI_ERROR_OK;
150+
}
151+
152+
nsapi_error_t AT_CellularDevice::set_ready_cb(mbed::Callback<void()> callback)
153+
{
154+
return NSAPI_ERROR_UNSUPPORTED;
155+
}
156+
157+
nsapi_error_t AT_CellularDevice::set_power_save_mode(int periodic_time, int active_time)
158+
{
159+
return NSAPI_ERROR_UNSUPPORTED;
160+
}
161+
162+
nsapi_error_t AT_CellularDevice::init()
163+
{
164+
return NSAPI_ERROR_OK;
165+
}
166+
167+
nsapi_error_t AT_CellularDevice::reset()
168+
{
169+
return NSAPI_ERROR_OK;
170+
}
171+
172+
nsapi_error_t AT_CellularDevice::shutdown()
147173
{
148174
return NSAPI_ERROR_OK;
149175
}

‎UNITTESTS/stubs/AT_CellularNetwork_stub.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,8 @@ bool AT_CellularNetwork::is_active_context()
150150
{
151151
return true;
152152
}
153+
154+
nsapi_error_t AT_CellularNetwork::set_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
155+
{
156+
return NSAPI_ERROR_OK;
157+
}

‎UNITTESTS/stubs/AT_CellularPower_stub.cpp

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -39,43 +39,3 @@ nsapi_error_t AT_CellularPower::off()
3939
{
4040
return NSAPI_ERROR_OK;
4141
}
42-
43-
nsapi_error_t AT_CellularPower::set_at_mode()
44-
{
45-
return NSAPI_ERROR_OK;
46-
}
47-
48-
nsapi_error_t AT_CellularPower::set_power_level(int func_level, int do_reset)
49-
{
50-
return NSAPI_ERROR_OK;
51-
}
52-
53-
nsapi_error_t AT_CellularPower::reset()
54-
{
55-
return NSAPI_ERROR_OK;
56-
}
57-
58-
nsapi_error_t AT_CellularPower::opt_power_save_mode(int periodic_time, int active_time)
59-
{
60-
return NSAPI_ERROR_OK;
61-
}
62-
63-
nsapi_error_t AT_CellularPower::opt_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
64-
{
65-
return NSAPI_ERROR_OK;
66-
}
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-
}
77-
78-
nsapi_error_t AT_CellularPower::is_device_ready()
79-
{
80-
return NSAPI_ERROR_OK;
81-
}

‎UNITTESTS/stubs/CellularDevice_stub.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,9 @@ nsapi_error_t CellularDevice::get_sim_state(SimState &state)
9797
{
9898
return NSAPI_ERROR_OK;
9999
}
100+
101+
nsapi_error_t CellularDevice::shutdown()
102+
{
103+
return NSAPI_ERROR_OK;
104+
}
105+

0 commit comments

Comments
 (0)