Skip to content

Commit 020e158

Browse files
Antti KauppilaAri Parkkila
authored andcommitted
Unittests fixed + readme updated
- Unittests were broken and are now fixed - README.md is updated to have small instructiopn how to run unittests
1 parent 6c6223a commit 020e158

21 files changed

+210
-142
lines changed

features/cellular/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,15 @@ Debug tracing level can be defined in mbed_app.json configuration file:
6262
"value": "TRACE_LEVEL_INFO"
6363
}
6464
}
65+
66+
## Unit tests
67+
68+
UNITTESTS folder contains unittests for Cellular specific classes. Unittests are based on stubbing method and some of the platform headers has been hacked under target_h/ folder to get things working.
69+
70+
You can run those tests locally by running ./run_tests script under UNITTESTS/ folder.
71+
72+
you will need at least following applications: cpputest, gcov and lcov (genhtml) for running the tests.
73+
After run_tests script has been run you can find test results under UNITTESTS/results folder and line & function coverages under UNITTESTS/coverages folder
74+
75+
76+

features/cellular/UNITTESTS/at/at_cellularbase/test_at_cellularbase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void Test_AT_CellularBase::test_AT_CellularBase_get_at_handler()
3838
{
3939
EventQueue eq;
4040
FileHandle_stub fh;
41-
ATHandler ah(&fh, eq, 100);
41+
ATHandler ah(&fh, eq, 100, ",");
4242
AT_CellularBase at(ah);
4343

4444
CHECK(&ah == &at.get_at_handler());
@@ -48,7 +48,7 @@ void Test_AT_CellularBase::test_AT_CellularBase_get_device_error()
4848
{
4949
EventQueue eq;
5050
FileHandle_stub fh;
51-
ATHandler ah(&fh, eq, 0);
51+
ATHandler ah(&fh, eq, 0, ",");
5252
AT_CellularBase at(ah);
5353

5454
ATHandler_stub::device_err_value.errCode = 8;

features/cellular/UNITTESTS/at/at_cellulardevice/test_at_cellulardevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void Test_AT_CellularDevice::test_AT_CellularDevice_close_information()
159159
dev.close_information();
160160

161161
ATHandler_stub::fh_value = &fh1;
162-
ATHandler at(&fh1, que, 0);
162+
ATHandler at(&fh1, que, 0, ",");
163163
AT_CellularBase_stub::handler_value = &at;
164164

165165
CHECK(dev.open_information(&fh1));

features/cellular/UNITTESTS/at/at_cellularinformation/test_at_cellularinformation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void Test_AT_CellularInformation::test_AT_CellularInformation_get_manufacturer()
4040
{
4141
EventQueue eq;
4242
FileHandle_stub fh;
43-
ATHandler ah(&fh, eq, 0);
43+
ATHandler ah(&fh, eq, 0, ",");
4444
AT_CellularInformation aci(ah);
4545

4646
ATHandler_stub::nsapi_error_value = 8;
@@ -53,7 +53,7 @@ void Test_AT_CellularInformation::test_AT_CellularInformation_get_model()
5353
{
5454
EventQueue eq;
5555
FileHandle_stub fh;
56-
ATHandler ah(&fh, eq, 0);
56+
ATHandler ah(&fh, eq, 0, ",");
5757
AT_CellularInformation aci(ah);
5858

5959
ATHandler_stub::nsapi_error_value = 7;
@@ -66,7 +66,7 @@ void Test_AT_CellularInformation::test_AT_CellularInformation_get_revision()
6666
{
6767
EventQueue eq;
6868
FileHandle_stub fh;
69-
ATHandler ah(&fh, eq, 0);
69+
ATHandler ah(&fh, eq, 0, ",");
7070

7171
//Used heap var here to visit heap constructor
7272
AT_CellularInformation *aci = new AT_CellularInformation(ah);

features/cellular/UNITTESTS/at/at_cellularmultiplexer/test_at_cellularmultiplexer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void Test_AT_CellularMultiplexer::test_AT_CellularMultiplexer_constructor()
3939
{
4040
EventQueue que;
4141
FileHandle_stub fh1;
42-
ATHandler at(&fh1, que, 0);
42+
ATHandler at(&fh1, que, 0, ",");
4343

4444
AT_CellularMultiplexer *cm = new AT_CellularMultiplexer(at);
4545
delete cm;
@@ -49,7 +49,7 @@ void Test_AT_CellularMultiplexer::test_AT_CellularMultiplexer_multiplexer_mode_s
4949
{
5050
EventQueue que;
5151
FileHandle_stub fh1;
52-
ATHandler at(&fh1, que, 0);
52+
ATHandler at(&fh1, que, 0, ",");
5353

5454
AT_CellularMultiplexer cm(at);
5555
CHECK(!cm.multiplexer_mode_start());

features/cellular/UNITTESTS/at/at_cellularnetwork/at_cellularnetworktest.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ TEST(AT_CellularNetwork, test_AT_CellularNetwork_get_backoff_time)
9292
unit->test_AT_CellularNetwork_get_backoff_time();
9393
}
9494

95-
TEST(AT_CellularNetwork, test_AT_CellularNetwork_connection_status_cb)
96-
{
97-
unit->test_AT_CellularNetwork_connection_status_cb();
98-
}
99-
10095
TEST(AT_CellularNetwork, test_AT_CellularNetwork_get_ip_address)
10196
{
10297
unit->test_AT_CellularNetwork_get_ip_address();

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

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
using namespace mbed;
2929
using namespace events;
3030

31+
class my_AT_CN : public AT_CellularNetwork {
32+
public:
33+
my_AT_CN(ATHandler &atHandler) : AT_CellularNetwork(atHandler) {}
34+
virtual ~my_AT_CN() {}
35+
NetworkStack *get_stack() {return AT_CellularNetwork::get_stack();}
36+
};
37+
3138
void conn_stat_cb(nsapi_error_t error)
3239
{
3340

@@ -47,7 +54,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_constructor()
4754
{
4855
EventQueue que;
4956
FileHandle_stub fh1;
50-
ATHandler at(&fh1, que, 0);
57+
ATHandler at(&fh1, que, 0, ",");
5158

5259
AT_CellularNetwork *cn = new AT_CellularNetwork(at);
5360

@@ -58,7 +65,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_credentials()
5865
{
5966
EventQueue que;
6067
FileHandle_stub fh1;
61-
ATHandler at(&fh1, que, 0);
68+
ATHandler at(&fh1, que, 0, ",");
6269

6370
AT_CellularNetwork cn(at);
6471
CHECK(NSAPI_ERROR_OK == cn.set_credentials("apn", CellularNetwork::CHAP));
@@ -70,7 +77,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_connect()
7077
{
7178
EventQueue que;
7279
FileHandle_stub fh1;
73-
ATHandler at(&fh1, que, 0);
80+
ATHandler at(&fh1, que, 0, ",");
7481

7582
AT_CellularNetwork cn(at);
7683
cn.set_stack_type(IPV4V6_STACK);
@@ -84,7 +91,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_disconnect()
8491
{
8592
EventQueue que;
8693
FileHandle_stub fh1;
87-
ATHandler at(&fh1, que, 0);
94+
ATHandler at(&fh1, que, 0, ",");
8895

8996
AT_CellularNetwork cn(at);
9097
CHECK(NSAPI_ERROR_OK == cn.disconnect());
@@ -94,17 +101,17 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_stack()
94101
{
95102
EventQueue que;
96103
FileHandle_stub fh1;
97-
ATHandler at(&fh1, que, 0);
104+
ATHandler at(&fh1, que, 0, ",");
98105

99-
AT_CellularNetwork cn(at);
106+
my_AT_CN cn(at);
100107
CHECK(!cn.get_stack());
101108
}
102109

103110
void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_registration()
104111
{
105112
EventQueue que;
106113
FileHandle_stub fh1;
107-
ATHandler at(&fh1, que, 0);
114+
ATHandler at(&fh1, que, 0, ",");
108115

109116
AT_CellularNetwork cn(at);
110117
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_CONNECTION_LOST;
@@ -115,7 +122,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_registration_status()
115122
{
116123
EventQueue que;
117124
FileHandle_stub fh1;
118-
ATHandler at(&fh1, que, 0);
125+
ATHandler at(&fh1, que, 0, ",");
119126

120127
AT_CellularNetwork cn(at);
121128
CellularNetwork::RegistrationStatus stat;
@@ -126,7 +133,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_attach()
126133
{
127134
EventQueue que;
128135
FileHandle_stub fh1;
129-
ATHandler at(&fh1, que, 0);
136+
ATHandler at(&fh1, que, 0, ",");
130137

131138
AT_CellularNetwork cn(at);
132139
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_CONNECTION_LOST;
@@ -137,7 +144,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_attach()
137144
{
138145
EventQueue que;
139146
FileHandle_stub fh1;
140-
ATHandler at(&fh1, que, 0);
147+
ATHandler at(&fh1, que, 0, ",");
141148

142149
AT_CellularNetwork cn(at);
143150
CellularNetwork::AttachStatus stat;
@@ -149,7 +156,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_rate_control()
149156
{
150157
EventQueue que;
151158
FileHandle_stub fh1;
152-
ATHandler at(&fh1, que, 0);
159+
ATHandler at(&fh1, que, 0, ",");
153160

154161
AT_CellularNetwork cn(at);
155162
int ur;
@@ -162,33 +169,20 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_backoff_time()
162169
{
163170
EventQueue que;
164171
FileHandle_stub fh1;
165-
ATHandler at(&fh1, que, 0);
172+
ATHandler at(&fh1, que, 0, ",");
166173

167174
AT_CellularNetwork cn(at);
168175
int time;
169176
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_CONNECTION_LOST;
170177
CHECK(NSAPI_ERROR_CONNECTION_LOST == cn.get_backoff_time(time));
171178
}
172179

173-
void Test_AT_CellularNetwork::test_AT_CellularNetwork_connection_status_cb()
174-
{
175-
EventQueue que;
176-
FileHandle_stub fh1;
177-
ATHandler at(&fh1, que, 0);
178-
179-
AT_CellularNetwork cn(at);
180-
cn.connection_status_cb(conn_stat_cb);
181-
182-
if(ATHandler_stub::callback){
183-
ATHandler_stub::callback();
184-
}
185-
}
186180

187181
void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_ip_address()
188182
{
189183
EventQueue que;
190184
FileHandle_stub fh1;
191-
ATHandler at(&fh1, que, 0);
185+
ATHandler at(&fh1, que, 0, ",");
192186

193187
AT_CellularNetwork cn(at);
194188
CHECK(!cn.get_ip_address());
@@ -198,7 +192,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_access_technology()
198192
{
199193
EventQueue que;
200194
FileHandle_stub fh1;
201-
ATHandler at(&fh1, que, 0);
195+
ATHandler at(&fh1, que, 0, ",");
202196

203197
AT_CellularNetwork cn(at);
204198
CHECK(NSAPI_ERROR_UNSUPPORTED == cn.set_access_technology(CellularNetwork::operator_t::RAT_UNKNOWN));
@@ -209,7 +203,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_scan_plmn()
209203
{
210204
EventQueue que;
211205
FileHandle_stub fh1;
212-
ATHandler at(&fh1, que, 0);
206+
ATHandler at(&fh1, que, 0, ",");
213207

214208
AT_CellularNetwork cn(at);
215209
int c;
@@ -222,7 +216,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_ciot_optimization_conf
222216
{
223217
EventQueue que;
224218
FileHandle_stub fh1;
225-
ATHandler at(&fh1, que, 0);
219+
ATHandler at(&fh1, que, 0, ",");
226220

227221
AT_CellularNetwork cn(at);
228222
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_CONNECTION_LOST;
@@ -233,7 +227,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_ciot_optimization_conf
233227
{
234228
EventQueue que;
235229
FileHandle_stub fh1;
236-
ATHandler at(&fh1, que, 0);
230+
ATHandler at(&fh1, que, 0, ",");
237231

238232
AT_CellularNetwork cn(at);
239233
CellularNetwork::Supported_UE_Opt sup;
@@ -246,7 +240,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_set_stack_type()
246240
{
247241
EventQueue que;
248242
FileHandle_stub fh1;
249-
ATHandler at(&fh1, que, 0);
243+
ATHandler at(&fh1, que, 0, ",");
250244

251245
AT_CellularNetwork cn(at);
252246
CHECK(NSAPI_ERROR_PARAMETER == cn.set_stack_type(IPV4_STACK));
@@ -258,7 +252,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_stack_type()
258252
{
259253
EventQueue que;
260254
FileHandle_stub fh1;
261-
ATHandler at(&fh1, que, 0);
255+
ATHandler at(&fh1, que, 0, ",");
262256

263257
AT_CellularNetwork cn(at);
264258
CHECK(DEFAULT_STACK == cn.get_stack_type());
@@ -268,7 +262,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_pdpcontext_params()
268262
{
269263
EventQueue que;
270264
FileHandle_stub fh1;
271-
ATHandler at(&fh1, que, 0);
265+
ATHandler at(&fh1, que, 0, ",");
272266

273267
AT_CellularNetwork cn(at);
274268
CellularNetwork::pdpContextList_t list;
@@ -280,7 +274,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_extended_signal_qualit
280274
{
281275
EventQueue que;
282276
FileHandle_stub fh1;
283-
ATHandler at(&fh1, que, 0);
277+
ATHandler at(&fh1, que, 0, ",");
284278

285279
AT_CellularNetwork cn(at);
286280
int rx,be,rs,ec,rsrq,rsrp;
@@ -294,7 +288,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_signal_quality()
294288
{
295289
EventQueue que;
296290
FileHandle_stub fh1;
297-
ATHandler at(&fh1, que, 0);
291+
ATHandler at(&fh1, que, 0, ",");
298292

299293
AT_CellularNetwork cn(at);
300294
int rs,ber;
@@ -308,7 +302,7 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_cell_id()
308302
{
309303
EventQueue que;
310304
FileHandle_stub fh1;
311-
ATHandler at(&fh1, que, 0);
305+
ATHandler at(&fh1, que, 0, ",");
312306

313307
AT_CellularNetwork cn(at);
314308
int id;
@@ -320,18 +314,18 @@ void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_3gpp_error()
320314
{
321315
EventQueue que;
322316
FileHandle_stub fh1;
323-
ATHandler at(&fh1, que, 0);
317+
ATHandler at(&fh1, que, 0, ",");
324318

325319
AT_CellularNetwork cn(at);
326-
ATHandler_stub::uint8_value = 8;
320+
ATHandler_stub::int_value = 8;
327321
CHECK(8 == cn.get_3gpp_error());
328322
}
329323

330324
void Test_AT_CellularNetwork::test_AT_CellularNetwork_get_operator_params()
331325
{
332326
EventQueue que;
333327
FileHandle_stub fh1;
334-
ATHandler at(&fh1, que, 0);
328+
ATHandler at(&fh1, que, 0, ",");
335329

336330
AT_CellularNetwork cn(at);
337331
int format;

features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ class Test_AT_CellularNetwork
4646

4747
void test_AT_CellularNetwork_get_backoff_time();
4848

49-
void test_AT_CellularNetwork_connection_status_cb();
50-
5149
void test_AT_CellularNetwork_get_ip_address();
5250

5351
void test_AT_CellularNetwork_set_access_technology();

0 commit comments

Comments
 (0)