Skip to content

Commit bff5c3b

Browse files
Kimmo Vaisanenadbridge
Kimmo Vaisanen
authored and
adbridge
committed
Cellular: Fix AT_CellularStack unittest
Missing CellularSocket constructor caused uninitialized values to be used. Also changed comparision macros to ASSERT_EQ as suggested by GoogleTest guide.
1 parent 3453063 commit bff5c3b

File tree

2 files changed

+41
-26
lines changed

2 files changed

+41
-26
lines changed

‎UNITTESTS/features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_get_ip_address)
175175
ATHandler at(&fh1, que, 0, ",");
176176

177177
MyStack st(at, 0, IPV6_STACK);
178-
EXPECT_TRUE(0 == strlen(st.get_ip_address()));
178+
EXPECT_EQ(strlen(st.get_ip_address()), 0);
179179

180180
char table[] = "1.2.3.4.5.65.7.8.9.10.11\0";
181181
ATHandler_stub::ssize_value = -1;
182182
ATHandler_stub::bool_value = true;
183183
ATHandler_stub::read_string_value = table;
184-
EXPECT_TRUE(NULL == st.get_ip_address());
184+
EXPECT_TRUE(st.get_ip_address() == NULL);
185185

186186
ATHandler_stub::ssize_value = strlen(table);
187187
ATHandler_stub::bool_value = true;
@@ -197,18 +197,18 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_open)
197197

198198
MyStack st(at, 0, IPV6_STACK);
199199
st.bool_value = false;
200-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == st.socket_open(NULL, NSAPI_TCP));
200+
EXPECT_EQ(st.socket_open(NULL, NSAPI_TCP), NSAPI_ERROR_UNSUPPORTED);
201201

202202
st.bool_value = true;
203203
st.max_sock_value = 0;
204204
nsapi_socket_t sock = &st.socket;
205-
EXPECT_TRUE(NSAPI_ERROR_NO_SOCKET == st.socket_open(&sock, NSAPI_TCP));
205+
EXPECT_EQ(st.socket_open(&sock, NSAPI_TCP), NSAPI_ERROR_NO_SOCKET);
206206

207207
MyStack st2(at, 0, IPV6_STACK);
208208
st2.bool_value = true;
209209
st2.max_sock_value = 1;
210210
sock = &st2.socket;
211-
EXPECT_TRUE(NSAPI_ERROR_OK == st2.socket_open(&sock, NSAPI_TCP));
211+
EXPECT_EQ(st2.socket_open(&sock, NSAPI_TCP), NSAPI_ERROR_OK);
212212
}
213213

214214
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_close)
@@ -218,21 +218,21 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_close)
218218
ATHandler at(&fh1, que, 0, ",");
219219

220220
MyStack st(at, 0, IPV6_STACK);
221-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_close(&st.socket));
221+
EXPECT_EQ(st.socket_close(&st.socket), NSAPI_ERROR_DEVICE_ERROR);
222222

223223
nsapi_socket_t sock = &st.socket;
224224
st.bool_value = true;
225225
st.max_sock_value = 1;
226-
EXPECT_TRUE(NSAPI_ERROR_OK == st.socket_open(&sock, NSAPI_TCP));
226+
EXPECT_EQ(st.socket_open(&sock, NSAPI_TCP), NSAPI_ERROR_OK);
227227
st.max_sock_value = 0;
228-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_close(sock));
228+
EXPECT_EQ(st.socket_close(sock), NSAPI_ERROR_DEVICE_ERROR);
229229

230230
MyStack st2(at, 0, IPV6_STACK);
231231
st2.max_sock_value = 1;
232232
st2.bool_value = true;
233233
sock = &st2.socket;
234-
EXPECT_TRUE(NSAPI_ERROR_OK == st2.socket_open(&sock, NSAPI_TCP));
235-
EXPECT_TRUE(NSAPI_ERROR_OK == st2.socket_close(sock));
234+
EXPECT_EQ(st2.socket_open(&sock, NSAPI_TCP), NSAPI_ERROR_OK);
235+
EXPECT_EQ(st2.socket_close(sock), NSAPI_ERROR_OK);
236236
}
237237

238238
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_bind)
@@ -244,9 +244,9 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_bind)
244244
MyStack st(at, 0, IPV6_STACK);
245245
SocketAddress addr;
246246
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_ALREADY;
247-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_bind(NULL, addr));
247+
EXPECT_EQ(st.socket_bind(NULL, addr), NSAPI_ERROR_DEVICE_ERROR);
248248

249-
EXPECT_TRUE(NSAPI_ERROR_ALREADY == st.socket_bind(&st.socket, addr));
249+
EXPECT_EQ(st.socket_bind(&st.socket, addr), NSAPI_ERROR_ALREADY);
250250
}
251251

252252
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_listen)
@@ -256,7 +256,7 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_listen)
256256
ATHandler at(&fh1, que, 0, ",");
257257

258258
MyStack st(at, 0, IPV6_STACK);
259-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == st.socket_listen(&st.socket, 4));
259+
EXPECT_EQ(st.socket_listen(&st.socket, 4), NSAPI_ERROR_UNSUPPORTED);
260260
}
261261

262262
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_connect)
@@ -267,9 +267,9 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_connect)
267267

268268
MyStack st(at, 0, IPV6_STACK);
269269
SocketAddress addr;
270-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_connect(NULL, addr));
270+
EXPECT_EQ(st.socket_connect(NULL, addr), NSAPI_ERROR_DEVICE_ERROR);
271271

272-
EXPECT_TRUE(NSAPI_ERROR_OK == st.socket_connect(&st.socket, addr));
272+
EXPECT_EQ(st.socket_connect(&st.socket, addr), NSAPI_ERROR_OK);
273273
}
274274

275275
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_accept)
@@ -280,7 +280,7 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_accept)
280280

281281
MyStack st(at, 0, IPV6_STACK);
282282
nsapi_socket_t sock = &st.socket;
283-
EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == st.socket_accept(NULL, &sock));
283+
EXPECT_EQ(st.socket_accept(NULL, &sock), NSAPI_ERROR_UNSUPPORTED);
284284
}
285285

286286
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_send)
@@ -290,17 +290,17 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_send)
290290
ATHandler at(&fh1, que, 0, ",");
291291

292292
MyStack st(at, 0, IPV6_STACK);
293-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_send(NULL, "addr", 4));
293+
EXPECT_EQ(st.socket_send(NULL, "addr", 4), NSAPI_ERROR_DEVICE_ERROR);
294294

295-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_send(&st.socket, "addr", 4));
295+
EXPECT_EQ(st.socket_send(&st.socket, "addr", 4), NSAPI_ERROR_DEVICE_ERROR);
296296

297297
SocketAddress addr;
298298
st.max_sock_value = 1;
299299
st.bool_value = true;
300300
nsapi_socket_t sock = &st.socket;
301301
st.socket_open(&sock, NSAPI_TCP);
302302
st.socket_connect(sock, addr);
303-
EXPECT_TRUE(NSAPI_ERROR_OK == st.socket_send(sock, "addr", 4));
303+
EXPECT_EQ(st.socket_send(sock, "addr", 4), NSAPI_ERROR_OK);
304304
}
305305

306306
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_sendto)
@@ -312,18 +312,18 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_sendto)
312312
MyStack st(at, 0, IPV6_STACK);
313313

314314
SocketAddress addr;
315-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_sendto(NULL, addr, "addr", 4));
315+
EXPECT_EQ(st.socket_sendto(NULL, addr, "addr", 4), NSAPI_ERROR_DEVICE_ERROR);
316316

317317
st.max_sock_value = 1;
318318
st.bool_value = true;
319319
nsapi_socket_t sock = &st.socket;
320320
st.socket_open(&sock, NSAPI_TCP);
321321
st.socket_connect(sock, addr);
322322
st.create_error = NSAPI_ERROR_CONNECTION_LOST;
323-
EXPECT_TRUE(NSAPI_ERROR_CONNECTION_LOST == st.socket_sendto(sock, addr, "addr", 4));
323+
EXPECT_EQ(st.socket_sendto(sock, addr, "addr", 4), NSAPI_ERROR_CONNECTION_LOST);
324324

325325
st.create_error = NSAPI_ERROR_OK;
326-
EXPECT_TRUE(NSAPI_ERROR_OK == st.socket_sendto(sock, addr, "addr", 4));
326+
EXPECT_EQ(st.socket_sendto(sock, addr, "addr", 4), NSAPI_ERROR_OK);
327327
}
328328

329329
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_recv)
@@ -334,7 +334,7 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_recv)
334334

335335
MyStack st(at, 0, IPV6_STACK);
336336
char table[4];
337-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_recv(NULL, table, 4));
337+
EXPECT_EQ(st.socket_recv(NULL, table, 4), NSAPI_ERROR_DEVICE_ERROR);
338338
}
339339

340340
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_recvfrom)
@@ -345,7 +345,7 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_recvfrom)
345345

346346
MyStack st(at, 0, IPV6_STACK);
347347
char table[4];
348-
EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == st.socket_recvfrom(NULL, NULL, table, 4));
348+
EXPECT_EQ(st.socket_recvfrom(NULL, NULL, table, 4), NSAPI_ERROR_DEVICE_ERROR);
349349

350350
SocketAddress addr;
351351
st.max_sock_value = 1;
@@ -354,10 +354,10 @@ TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_recvfrom)
354354
st.socket_open(&sock, NSAPI_TCP);
355355
st.socket_connect(sock, addr);
356356
st.create_error = NSAPI_ERROR_CONNECTION_LOST;
357-
EXPECT_TRUE(NSAPI_ERROR_CONNECTION_LOST == st.socket_recvfrom(sock, &addr, table, 4));
357+
EXPECT_EQ(st.socket_recvfrom(sock, &addr, table, 4), NSAPI_ERROR_CONNECTION_LOST);
358358

359359
st.create_error = NSAPI_ERROR_OK;
360-
EXPECT_TRUE(NSAPI_ERROR_OK == st.socket_recvfrom(sock, &addr, table, 4));
360+
EXPECT_EQ(st.socket_recvfrom(sock, &addr, table, 4), NSAPI_ERROR_OK);
361361
}
362362

363363
TEST_F(TestAT_CellularStack, test_AT_CellularStack_socket_attach)

‎features/cellular/framework/AT/AT_CellularStack.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,21 @@ class AT_CellularStack : public NetworkStack, public AT_CellularBase {
8383

8484
class CellularSocket {
8585
public:
86+
CellularSocket() :
87+
id(-1),
88+
connected(false),
89+
proto(NSAPI_UDP),
90+
remoteAddress("", 0),
91+
localAddress("", 0),
92+
_cb(NULL),
93+
_data(NULL),
94+
created(false),
95+
started(false),
96+
tx_ready(false),
97+
rx_avail(false),
98+
pending_bytes(0)
99+
{
100+
}
86101
// Socket id from cellular device
87102
int id;
88103
// Being connected means remote ip address and port are set

0 commit comments

Comments
 (0)