diff options
Diffstat (limited to 'auto_tests/messenger_test.c')
-rw-r--r-- | auto_tests/messenger_test.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c index 605fa4f3..52c49650 100644 --- a/auto_tests/messenger_test.c +++ b/auto_tests/messenger_test.c | |||
@@ -276,18 +276,18 @@ START_TEST(test_messenger_state_saveloadsave) | |||
276 | * c) a second save() is of equal size | 276 | * c) a second save() is of equal size |
277 | * d) the second save() is of equal content */ | 277 | * d) the second save() is of equal content */ |
278 | size_t i, extra = 64; | 278 | size_t i, extra = 64; |
279 | size_t size = Messenger_size(m); | 279 | size_t size = messenger_size(m); |
280 | uint8_t buffer[size + 2 * extra]; | 280 | uint8_t buffer[size + 2 * extra]; |
281 | memset(buffer, 0xCD, extra); | 281 | memset(buffer, 0xCD, extra); |
282 | memset(buffer + extra + size, 0xCD, extra); | 282 | memset(buffer + extra + size, 0xCD, extra); |
283 | Messenger_save(m, buffer + extra); | 283 | messenger_save(m, buffer + extra); |
284 | 284 | ||
285 | for (i = 0; i < extra; i++) { | 285 | for (i = 0; i < extra; i++) { |
286 | ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from Messenger_save() @%u", i); | 286 | ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from messenger_save() @%u", i); |
287 | ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from Messenger_save() @%u", i); | 287 | ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from messenger_save() @%u", i); |
288 | } | 288 | } |
289 | 289 | ||
290 | int res = Messenger_load(m, buffer + extra, size); | 290 | int res = messenger_load(m, buffer + extra, size); |
291 | 291 | ||
292 | if (res == -1) | 292 | if (res == -1) |
293 | ck_assert_msg(res == 0, "Failed to load back stored buffer: res == -1"); | 293 | ck_assert_msg(res == 0, "Failed to load back stored buffer: res == -1"); |
@@ -300,11 +300,11 @@ START_TEST(test_messenger_state_saveloadsave) | |||
300 | ck_assert_msg(res == 0, msg); | 300 | ck_assert_msg(res == 0, msg); |
301 | } | 301 | } |
302 | 302 | ||
303 | size_t size2 = Messenger_size(m); | 303 | size_t size2 = messenger_size(m); |
304 | ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", size, size2); | 304 | ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", size, size2); |
305 | 305 | ||
306 | uint8_t buffer2[size2]; | 306 | uint8_t buffer2[size2]; |
307 | Messenger_save(m, buffer2); | 307 | messenger_save(m, buffer2); |
308 | 308 | ||
309 | ck_assert_msg(!memcmp(buffer + extra, buffer2, size), "Messenger state changed by store/load/store cycle"); | 309 | ck_assert_msg(!memcmp(buffer + extra, buffer2, size), "Messenger state changed by store/load/store cycle"); |
310 | } | 310 | } |
@@ -350,7 +350,7 @@ int main(int argc, char *argv[]) | |||
350 | bad_id = hex_string_to_bin(bad_id_str); | 350 | bad_id = hex_string_to_bin(bad_id_str); |
351 | 351 | ||
352 | /* IPv6 status from global define */ | 352 | /* IPv6 status from global define */ |
353 | m = initMessenger(TOX_ENABLE_IPV6_DEFAULT); | 353 | m = new_messenger(TOX_ENABLE_IPV6_DEFAULT); |
354 | 354 | ||
355 | /* setup a default friend and friendnum */ | 355 | /* setup a default friend and friendnum */ |
356 | if (m_addfriend_norequest(m, (uint8_t *)friend_id) < 0) | 356 | if (m_addfriend_norequest(m, (uint8_t *)friend_id) < 0) |
@@ -372,7 +372,7 @@ int main(int argc, char *argv[]) | |||
372 | free(good_id_b); | 372 | free(good_id_b); |
373 | free(bad_id); | 373 | free(bad_id); |
374 | 374 | ||
375 | cleanupMessenger(m); | 375 | kill_messenger(m); |
376 | 376 | ||
377 | return number_failed; | 377 | return number_failed; |
378 | } | 378 | } |