Split up tox_test into multiple smaller tests

CMakeLists.txt

@@ -525,19 +525,26 @@ auto_test(crypto                        MSVC_DONT_BUILD)
 auto_test(dht                           MSVC_DONT_BUILD)
 auto_test(encryptsave)
 auto_test(file_transfer)
+auto_test(friend_request)
 auto_test(lan_discovery)
+auto_test(lossless_packet)
+auto_test(lossy_packet)
 auto_test(messenger                     MSVC_DONT_BUILD)
 auto_test(network)
 auto_test(onion)
 auto_test(resource_leak)
 auto_test(save_friend)
+auto_test(save_load)
+auto_test(send_message)
+auto_test(set_name)
+auto_test(set_status_message)
 auto_test(simple_conference)
 auto_test(skeleton)
-auto_test(tox)
 auto_test(tox_many)
 auto_test(tox_many_tcp)
 auto_test(tox_one)
 auto_test(tox_strncasecmp)
+auto_test(typing)
 auto_test(version)
 # TODO(iphydf): These tests are broken. The code needs to be fixed, as the
 # tests themselves are correct.

auto_tests/friend_request_test.c

@@ -0,0 +1,92 @@
+/* Tests that we can add friends.
+ */
+
+#ifndef _XOPEN_SOURCE
+#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 "../toxcore/ccompat.h"
+#include "../toxcore/tox.h"
+#include "../toxcore/util.h"
+
+#include "helpers.h"
+
+#define FR_MESSAGE "Gentoo"
+
+static void accept_friend_request(Tox *tox, const uint8_t *public_key, const uint8_t *data, size_t length,
+                                  void *userdata)
+{
+    ck_assert_msg(length == sizeof(FR_MESSAGE) && memcmp(FR_MESSAGE, data, sizeof(FR_MESSAGE)) == 0,
+                  "unexpected friend request message");
+    tox_friend_add_norequest(tox, public_key, nullptr);
+}
+
+static void test_friend_request(void)
+{
+    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("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);
+
+    printf("tox1 adds tox2 as friend, tox2 accepts\n");
+    tox_callback_friend_request(tox2, accept_friend_request);
+
+    uint8_t address[TOX_ADDRESS_SIZE];
+    tox_self_get_address(tox2, address);
+
+    const uint32_t test = tox_friend_add(tox1, address, (const uint8_t *)FR_MESSAGE, sizeof(FR_MESSAGE), nullptr);
+    ck_assert_msg(test == 0, "Failed to add friend error code: %i", test);
+
+    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);
+    printf("test_friend_request succeeded, took %ld seconds\n", time(nullptr) - cur_time);
+
+    tox_kill(tox1);
+    tox_kill(tox2);
+}
+
+int main(int argc, char *argv[])
+{
+    setvbuf(stdout, nullptr, _IONBF, 0);
+
+    test_friend_request();
+    return 0;
+}

auto_tests/helpers.h

@@ -17,6 +17,8 @@
 #define c_sleep(x) usleep(1000 * (x))
 #endif
 
+#define ITERATION_INTERVAL 200
+
 static const char *tox_log_level_name(TOX_LOG_LEVEL level)
 {
     switch (level) {
@@ -54,6 +56,7 @@ Tox *tox_new_log(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_d
 
     if (log_options == nullptr) {
         log_options = tox_options_new(nullptr);
+        // tox_options_set_local_discovery_enabled(log_options, false);
     }
 
     assert(log_options != nullptr);

auto_tests/lossless_packet_test.c

@@ -0,0 +1,112 @@
+/* Tests that we can send lossless packets.
+ */
+
+#ifndef _XOPEN_SOURCE
+#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 "../toxcore/ccompat.h"
+#include "../toxcore/tox.h"
+#include "../toxcore/util.h"
+
+#include "helpers.h"
+
+#define CUSTOM_PACKET_FILLER 160
+
+static void handle_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
+                                   void *user_data)
+{
+    uint8_t cmp_packet[TOX_MAX_CUSTOM_PACKET_SIZE];
+    memset(cmp_packet, CUSTOM_PACKET_FILLER, sizeof(cmp_packet));
+
+    if (length == TOX_MAX_CUSTOM_PACKET_SIZE && memcmp(data, cmp_packet, sizeof(cmp_packet)) == 0) {
+        bool *custom_packet_received = (bool *)user_data;
+        *custom_packet_received = true;
+    }
+}
+
+static void test_lossless_packet(void)
+{
+    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(200);
+    }
+
+    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(200);
+    }
+
+    printf("tox clients connected took %ld seconds\n", time(nullptr) - con_time);
+
+    tox_callback_friend_lossless_packet(tox2, &handle_lossless_packet);
+    uint8_t packet[TOX_MAX_CUSTOM_PACKET_SIZE + 1];
+    memset(packet, CUSTOM_PACKET_FILLER, sizeof(packet));
+    bool ret = tox_friend_send_lossless_packet(tox1, 0, packet, sizeof(packet), nullptr);
+    ck_assert_msg(ret == false, "tox_friend_send_lossless_packet bigger fail %i", ret);
+    ret = tox_friend_send_lossless_packet(tox1, 0, packet, TOX_MAX_CUSTOM_PACKET_SIZE, nullptr);
+    ck_assert_msg(ret == true, "tox_friend_send_lossless_packet fail %i", ret);
+
+    bool received_lossless_packet = false;
+
+    while (!received_lossless_packet) {
+        tox_iterate(tox1, nullptr);
+        tox_iterate(tox2, &received_lossless_packet);
+
+        c_sleep(200);
+    }
+
+    printf("test_lossless_packet succeeded, took %ld seconds\n", time(nullptr) - cur_time);
+
+    tox_kill(tox1);
+    tox_kill(tox2);
+}
+
+int main(int argc, char *argv[])
+{
+    setvbuf(stdout, nullptr, _IONBF, 0);
+
+    test_lossless_packet();
+    return 0;
+}

auto_tests/lossy_packet_test.c

@@ -0,0 +1,109 @@
+/* Tests that we can send lossy packets.
+ */
+
+#ifndef _XOPEN_SOURCE
+#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 "../toxcore/ccompat.h"
+#include "../toxcore/tox.h"
+#include "../toxcore/util.h"
+
+#include "helpers.h"
+
+#define CUSTOM_PACKET_FILLER 200
+
+static void handle_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length, void *user_data)
+{
+    uint8_t cmp_packet[TOX_MAX_CUSTOM_PACKET_SIZE];
+    memset(cmp_packet, CUSTOM_PACKET_FILLER, sizeof(cmp_packet));
+
+    if (length == TOX_MAX_CUSTOM_PACKET_SIZE && memcmp(data, cmp_packet, sizeof(cmp_packet)) == 0) {
+        bool *custom_packet_received = (bool *)user_data;
+        *custom_packet_received = true;
+    }
+}
+
+static void test_lossy_packet(void)
+{
+    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(200);
+    }
+
+    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(200);
+    }
+
+    printf("tox clients connected took %ld seconds\n", time(nullptr) - con_time);
+
+    tox_callback_friend_lossy_packet(tox2, &handle_lossy_packet);
+    uint8_t packet[TOX_MAX_CUSTOM_PACKET_SIZE + 1];
+    memset(packet, CUSTOM_PACKET_FILLER, sizeof(packet));
+    bool ret = tox_friend_send_lossy_packet(tox1, 0, packet, sizeof(packet), nullptr);
+    ck_assert_msg(ret == false, "tox_friend_send_lossy_packet bigger fail %i", ret);
+    ret = tox_friend_send_lossy_packet(tox1, 0, packet, TOX_MAX_CUSTOM_PACKET_SIZE, nullptr);
+    ck_assert_msg(ret == true, "tox_friend_send_lossy_packet fail %i", ret);
+
+    bool received_lossy_packet = false;
+
+    while (!received_lossy_packet) {
+        tox_iterate(tox1, nullptr);
+        tox_iterate(tox2, &received_lossy_packet);
+        c_sleep(200);
+    }
+
+    printf("test_lossy_packet succeeded, took %ld seconds\n", time(nullptr) - cur_time);
+
+    tox_kill(tox1);
+    tox_kill(tox2);
+}
+
+int main(int argc, char *argv[])
+{
+    setvbuf(stdout, nullptr, _IONBF, 0);
+
+    test_lossy_packet();
+    return 0;
+}