@@ -139,6 +139,13 @@ static void setup(void *f)
139
139
k_sem_init (& mqtt_sn_cb_sem , 0 , 1 );
140
140
}
141
141
142
+ static void cleanup (void * f )
143
+ {
144
+ ARG_UNUSED (f );
145
+
146
+ mqtt_sn_client_deinit (mqtt_client );
147
+ }
148
+
142
149
static int input (struct mqtt_sn_client * client , void * buf , size_t sz ,
143
150
const struct mqtt_sn_data * src_addr )
144
151
{
@@ -222,8 +229,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_handle_advertise)
222
229
zassert_equal (evt_cb_data .called , 4 , "NO event" );
223
230
zassert_equal (evt_cb_data .last_evt .type , MQTT_SN_EVT_DISCONNECTED , "Wrong event" );
224
231
zassert_equal (mqtt_client -> state , 0 , "Wrong state" );
225
-
226
- mqtt_sn_client_deinit (mqtt_client );
227
232
}
228
233
229
234
static ZTEST (mqtt_sn_client , test_mqtt_sn_add_gw )
@@ -238,8 +243,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_add_gw)
238
243
zassert_equal (err , 0 , "unexpected error %d" );
239
244
zassert_false (sys_slist_is_empty (& mqtt_client -> gateway ), "GW not saved." );
240
245
zassert_equal (evt_cb_data .called , 0 , "Unexpected event" );
241
-
242
- mqtt_sn_client_deinit (mqtt_client );
243
246
}
244
247
245
248
/* Test send SEARCHGW and GW response */
@@ -271,8 +274,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_search_gw)
271
274
zassert_equal (err , 0 , "unexpected error %d" );
272
275
zassert_false (sys_slist_is_empty (& mqtt_client -> gateway ), "GW not saved." );
273
276
zassert_equal (evt_cb_data .last_evt .type , MQTT_SN_EVT_GWINFO , "Wrong event" );
274
-
275
- mqtt_sn_client_deinit (mqtt_client );
276
277
}
277
278
278
279
/* Test send SEARCHGW and peer response */
@@ -306,8 +307,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_search_peer)
306
307
zassert_false (sys_slist_is_empty (& mqtt_client -> gateway ), "GW not saved." );
307
308
zassert_equal (evt_cb_data .called , 1 , "NO event" );
308
309
zassert_equal (evt_cb_data .last_evt .type , MQTT_SN_EVT_GWINFO , "Wrong event" );
309
-
310
- mqtt_sn_client_deinit (mqtt_client );
311
310
}
312
311
313
312
static ZTEST (mqtt_sn_client , test_mqtt_sn_respond_searchgw )
@@ -334,14 +333,11 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_respond_searchgw)
334
333
zassert_equal (evt_cb_data .called , 1 , "NO event" );
335
334
zassert_equal (evt_cb_data .last_evt .type , MQTT_SN_EVT_SEARCHGW , "Wrong event" );
336
335
assert_msg_send (1 , 3 + gw_addr .size , NULL );
337
-
338
- mqtt_sn_client_deinit (mqtt_client );
339
336
}
340
337
341
338
static ZTEST (mqtt_sn_client , test_mqtt_sn_connect_no_will )
342
339
{
343
340
mqtt_sn_connect_no_will (mqtt_client );
344
- mqtt_sn_client_deinit (mqtt_client );
345
341
}
346
342
347
343
static ZTEST (mqtt_sn_client , test_mqtt_sn_connect_will )
@@ -385,8 +381,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_connect_will)
385
381
zassert_equal (mqtt_client -> state , 1 , "Wrong state" );
386
382
zassert_equal (evt_cb_data .called , 1 , "NO event" );
387
383
zassert_equal (evt_cb_data .last_evt .type , MQTT_SN_EVT_CONNECTED , "Wrong event" );
388
-
389
- mqtt_sn_client_deinit (mqtt_client );
390
384
}
391
385
392
386
static ZTEST (mqtt_sn_client , test_mqtt_sn_publish_qos0 )
@@ -419,7 +413,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_publish_qos0)
419
413
zassert_true (sys_slist_is_empty (& mqtt_client -> publish ), "Publish not empty" );
420
414
zassert_false (sys_slist_is_empty (& mqtt_client -> topic ), "Topic empty" );
421
415
422
- mqtt_sn_client_deinit (mqtt_client );
423
416
}
424
417
425
- ZTEST_SUITE (mqtt_sn_client , NULL , NULL , setup , NULL , NULL );
418
+ ZTEST_SUITE (mqtt_sn_client , NULL , NULL , setup , cleanup , NULL );
0 commit comments