Skip to content

Commit 25c78a2

Browse files
BeckmaRfabiobaltieri
authored andcommitted
net: mqtt-sn: Use after function in tests
Use an after function to deinit the client. Signed-off-by: Rene Beckmann <rene.bckmnn@gmail.com>
1 parent b7c4047 commit 25c78a2

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

tests/net/lib/mqtt_sn_client/src/mqtt_sn_client.c

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ static void setup(void *f)
139139
k_sem_init(&mqtt_sn_cb_sem, 0, 1);
140140
}
141141

142+
static void cleanup(void *f)
143+
{
144+
ARG_UNUSED(f);
145+
146+
mqtt_sn_client_deinit(mqtt_client);
147+
}
148+
142149
static int input(struct mqtt_sn_client *client, void *buf, size_t sz,
143150
const struct mqtt_sn_data *src_addr)
144151
{
@@ -222,8 +229,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_handle_advertise)
222229
zassert_equal(evt_cb_data.called, 4, "NO event");
223230
zassert_equal(evt_cb_data.last_evt.type, MQTT_SN_EVT_DISCONNECTED, "Wrong event");
224231
zassert_equal(mqtt_client->state, 0, "Wrong state");
225-
226-
mqtt_sn_client_deinit(mqtt_client);
227232
}
228233

229234
static ZTEST(mqtt_sn_client, test_mqtt_sn_add_gw)
@@ -238,8 +243,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_add_gw)
238243
zassert_equal(err, 0, "unexpected error %d");
239244
zassert_false(sys_slist_is_empty(&mqtt_client->gateway), "GW not saved.");
240245
zassert_equal(evt_cb_data.called, 0, "Unexpected event");
241-
242-
mqtt_sn_client_deinit(mqtt_client);
243246
}
244247

245248
/* Test send SEARCHGW and GW response */
@@ -271,8 +274,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_search_gw)
271274
zassert_equal(err, 0, "unexpected error %d");
272275
zassert_false(sys_slist_is_empty(&mqtt_client->gateway), "GW not saved.");
273276
zassert_equal(evt_cb_data.last_evt.type, MQTT_SN_EVT_GWINFO, "Wrong event");
274-
275-
mqtt_sn_client_deinit(mqtt_client);
276277
}
277278

278279
/* Test send SEARCHGW and peer response */
@@ -306,8 +307,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_search_peer)
306307
zassert_false(sys_slist_is_empty(&mqtt_client->gateway), "GW not saved.");
307308
zassert_equal(evt_cb_data.called, 1, "NO event");
308309
zassert_equal(evt_cb_data.last_evt.type, MQTT_SN_EVT_GWINFO, "Wrong event");
309-
310-
mqtt_sn_client_deinit(mqtt_client);
311310
}
312311

313312
static ZTEST(mqtt_sn_client, test_mqtt_sn_respond_searchgw)
@@ -334,14 +333,11 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_respond_searchgw)
334333
zassert_equal(evt_cb_data.called, 1, "NO event");
335334
zassert_equal(evt_cb_data.last_evt.type, MQTT_SN_EVT_SEARCHGW, "Wrong event");
336335
assert_msg_send(1, 3 + gw_addr.size, NULL);
337-
338-
mqtt_sn_client_deinit(mqtt_client);
339336
}
340337

341338
static ZTEST(mqtt_sn_client, test_mqtt_sn_connect_no_will)
342339
{
343340
mqtt_sn_connect_no_will(mqtt_client);
344-
mqtt_sn_client_deinit(mqtt_client);
345341
}
346342

347343
static ZTEST(mqtt_sn_client, test_mqtt_sn_connect_will)
@@ -385,8 +381,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_connect_will)
385381
zassert_equal(mqtt_client->state, 1, "Wrong state");
386382
zassert_equal(evt_cb_data.called, 1, "NO event");
387383
zassert_equal(evt_cb_data.last_evt.type, MQTT_SN_EVT_CONNECTED, "Wrong event");
388-
389-
mqtt_sn_client_deinit(mqtt_client);
390384
}
391385

392386
static ZTEST(mqtt_sn_client, test_mqtt_sn_publish_qos0)
@@ -419,7 +413,6 @@ static ZTEST(mqtt_sn_client, test_mqtt_sn_publish_qos0)
419413
zassert_true(sys_slist_is_empty(&mqtt_client->publish), "Publish not empty");
420414
zassert_false(sys_slist_is_empty(&mqtt_client->topic), "Topic empty");
421415

422-
mqtt_sn_client_deinit(mqtt_client);
423416
}
424417

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

Comments
 (0)