1 files changed, 21 insertions, 75 deletions

diff --git a/auto_tests/send_message_test.c b/auto_tests/send_message_test.c
index 35ef5a62..822ea64f 100644
--- a/auto_tests/send_message_test.c
+++ b/auto_tests/send_message_test.c
@@ -5,27 +5,24 @@
 #define _XOPEN_SOURCE 600
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "check_compat.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
+#include <stdbool.h>
+#include <stdint.h>
 
-#include "../toxcore/ccompat.h"
-#include "../toxcore/tox.h"
-#include "../toxcore/util.h"
+typedef struct State {
+    uint32_t index;
+    bool message_received;
+} State;
 
-#include "helpers.h"
+#include "run_auto_test.h"
 
 #define MESSAGE_FILLER 'G'
 
-static void message_callback(Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE type, const uint8_t *string, size_t length,
-                             void *userdata)
+static void message_callback(
+    Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE type,
+    const uint8_t *string, size_t length, void *userdata)
 {
+    State *state = (State *)userdata;
+
     if (type != TOX_MESSAGE_TYPE_NORMAL) {
         ck_abort_msg("Bad type");
     }
@@ -34,87 +31,36 @@ static void message_callback(Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE typ
     memset(cmp_msg, MESSAGE_FILLER, sizeof(cmp_msg));
 
     if (length == TOX_MAX_MESSAGE_LENGTH && memcmp(string, cmp_msg, sizeof(cmp_msg)) == 0) {
-        bool *message_received = (bool *)userdata;
-        *message_received = true;
+        state->message_received = true;
     }
 }
 
-static void test_send_message(void)
+static void send_message_test(Tox **toxes, State *state)
 {
-    printf("initialising 2 toxes\n");
-    uint32_t index[] = { 1, 2 };
-    const time_t cur_time = time(nullptr);
-    Tox *const tox1 = tox_new_log(nullptr, nullptr, &index[0]);
-    Tox *const tox2 = tox_new_log(nullptr, nullptr, &index[1]);
-
-    ck_assert_msg(tox1 && tox2, "failed to create 2 tox instances");
-
-    printf("tox1 adds tox2 as friend, tox2 adds tox1\n");
-    uint8_t public_key[TOX_PUBLIC_KEY_SIZE];
-    tox_self_get_public_key(tox2, public_key);
-    tox_friend_add_norequest(tox1, public_key, nullptr);
-    tox_self_get_public_key(tox1, public_key);
-    tox_friend_add_norequest(tox2, public_key, nullptr);
-
-    printf("bootstrapping tox2 off tox1\n");
-    uint8_t dht_key[TOX_PUBLIC_KEY_SIZE];
-    tox_self_get_dht_id(tox1, dht_key);
-    const uint16_t dht_port = tox_self_get_udp_port(tox1, nullptr);
-
-    tox_bootstrap(tox2, "localhost", dht_port, dht_key, nullptr);
-
-    while (tox_self_get_connection_status(tox1) == TOX_CONNECTION_NONE ||
-            tox_self_get_connection_status(tox2) == TOX_CONNECTION_NONE) {
-        tox_iterate(tox1, nullptr);
-        tox_iterate(tox2, nullptr);
-
-        c_sleep(ITERATION_INTERVAL);
-    }
-
-    printf("toxes are online, took %ld seconds\n", time(nullptr) - cur_time);
-    const time_t con_time = time(nullptr);
-
-    while (tox_friend_get_connection_status(tox1, 0, nullptr) != TOX_CONNECTION_UDP ||
-            tox_friend_get_connection_status(tox2, 0, nullptr) != TOX_CONNECTION_UDP) {
-        tox_iterate(tox1, nullptr);
-        tox_iterate(tox2, nullptr);
-
-        c_sleep(ITERATION_INTERVAL);
-    }
-
-    printf("tox clients connected took %ld seconds\n", time(nullptr) - con_time);
-
-    tox_callback_friend_message(tox2, &message_callback);
+    tox_callback_friend_message(toxes[1], &message_callback);
 
     uint8_t msgs[TOX_MAX_MESSAGE_LENGTH + 1];
     memset(msgs, MESSAGE_FILLER, sizeof(msgs));
 
     TOX_ERR_FRIEND_SEND_MESSAGE errm;
-    tox_friend_send_message(tox1, 0, TOX_MESSAGE_TYPE_NORMAL, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
+    tox_friend_send_message(toxes[0], 0, TOX_MESSAGE_TYPE_NORMAL, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
     ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG, "TOX_MAX_MESSAGE_LENGTH is too small? error=%d", errm);
 
-    tox_friend_send_message(tox1, 0, TOX_MESSAGE_TYPE_NORMAL, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
+    tox_friend_send_message(toxes[0], 0, TOX_MESSAGE_TYPE_NORMAL, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
     ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_OK, "TOX_MAX_MESSAGE_LENGTH is too big? error=%d", errm);
 
-    bool message_received = false;
-
-    while (!message_received) {
-        tox_iterate(tox1, nullptr);
-        tox_iterate(tox2, &message_received);
+    while (!state[1].message_received) {
+        tox_iterate(toxes[0], &state[0]);
+        tox_iterate(toxes[1], &state[1]);
 
         c_sleep(ITERATION_INTERVAL);
     }
-
-    printf("tox clients messaging succeeded\n");
-
-    tox_kill(tox1);
-    tox_kill(tox2);
 }
 
 int main(void)
 {
     setvbuf(stdout, nullptr, _IONBF, 0);
 
-    test_send_message();
+    run_auto_test(2, send_message_test);
     return 0;
 }