Avoid redefining macros from different files.

1 files changed, 23 insertions, 20 deletions

diff --git a/auto_tests/save_compatibility_test.c b/auto_tests/save_compatibility_test.c
index 08ac9e17..07ffc52a 100644
--- a/auto_tests/save_compatibility_test.c
+++ b/auto_tests/save_compatibility_test.c
@@ -6,16 +6,16 @@
 
 #include <string.h>
 
-#define SAVE_FILE "../auto_tests/data/save.tox"
+#define LOADED_SAVE_FILE "../auto_tests/data/save.tox"
 
 // Information from the save file
-#define NAME "name"
-#define NAME_SIZE strlen(NAME)
-#define STATUS_MESSAGE "Hello World"
-#define STATUS_MESSAGE_SIZE strlen(STATUS_MESSAGE)
-#define NUM_FRIENDS 1
-#define NOSPAM "4C762C7D"
-#define TOX_ID "B70E97D41F69B7F4C42A5BC7BD7A76B95B8030BE1B7C0E9E6FC19FC4ABEB195B4C762C7D800B"
+#define EXPECTED_NAME "name"
+#define EXPECTED_NAME_SIZE strlen(EXPECTED_NAME)
+#define EXPECTED_STATUS_MESSAGE "Hello World"
+#define EXPECTED_STATUS_MESSAGE_SIZE strlen(EXPECTED_STATUS_MESSAGE)
+#define EXPECTED_NUM_FRIENDS 1
+#define EXPECTED_NOSPAM "4C762C7D"
+#define EXPECTED_TOX_ID "B70E97D41F69B7F4C42A5BC7BD7A76B95B8030BE1B7C0E9E6FC19FC4ABEB195B4C762C7D800B"
 
 static size_t get_file_size(const char *save_path)
 {
@@ -83,38 +83,41 @@ static void test_save_compatibility(const char *save_path)
     free(save_data);
 
     const size_t name_size = tox_self_get_name_size(tox);
-    ck_assert_msg(name_size == NAME_SIZE, "name sizes do not match expected %zu got %zu", NAME_SIZE, name_size);
+    ck_assert_msg(name_size == EXPECTED_NAME_SIZE, "name sizes do not match expected %zu got %zu", EXPECTED_NAME_SIZE,
+                  name_size);
 
     uint8_t name[TOX_MAX_NAME_LENGTH];
     tox_self_get_name(tox, name);
-    ck_assert_msg(strncmp((const char *)name, NAME, name_size) == 0, "names do not match, expected %s got %s", NAME, name);
+    ck_assert_msg(strncmp((const char *)name, EXPECTED_NAME, name_size) == 0,
+                  "names do not match, expected %s got %s", EXPECTED_NAME, name);
 
     const size_t status_message_size = tox_self_get_status_message_size(tox);
-    ck_assert_msg(status_message_size == STATUS_MESSAGE_SIZE, "status message sizes do not match, expected %zu got %zu",
-                  STATUS_MESSAGE_SIZE, status_message_size);
+    ck_assert_msg(status_message_size == EXPECTED_STATUS_MESSAGE_SIZE,
+                  "status message sizes do not match, expected %zu got %zu", EXPECTED_STATUS_MESSAGE_SIZE, status_message_size);
 
     uint8_t status_message[TOX_MAX_STATUS_MESSAGE_LENGTH];
     tox_self_get_status_message(tox, status_message);
-    ck_assert_msg(strncmp((const char *)status_message, STATUS_MESSAGE, status_message_size) == 0,
+    ck_assert_msg(strncmp((const char *)status_message, EXPECTED_STATUS_MESSAGE, status_message_size) == 0,
                   "status messages do not match, expected %s got %s",
-                  STATUS_MESSAGE, status_message);
+                  EXPECTED_STATUS_MESSAGE, status_message);
 
     const size_t num_friends = tox_self_get_friend_list_size(tox);
-    ck_assert_msg(num_friends == NUM_FRIENDS, "number of friends do not match, expected %d got %zu", NUM_FRIENDS,
-                  num_friends);
+    ck_assert_msg(num_friends == EXPECTED_NUM_FRIENDS,
+                  "number of friends do not match, expected %d got %zu",  EXPECTED_NUM_FRIENDS, num_friends);
 
     const uint32_t nospam = tox_self_get_nospam(tox);
     char nospam_str[(TOX_NOSPAM_SIZE * 2) + 1];
     const size_t length = snprintf(nospam_str, sizeof(nospam_str), "%08X", nospam);
     nospam_str[length] = '\0';
-    ck_assert_msg(strcmp(nospam_str, NOSPAM) == 0, "nospam does not match, expected %s got %s", NOSPAM, nospam_str);
+    ck_assert_msg(strcmp(nospam_str, EXPECTED_NOSPAM) == 0,
+                  "nospam does not match, expected %s got %s", EXPECTED_NOSPAM, nospam_str);
 
     uint8_t tox_id[TOX_ADDRESS_SIZE];
     char tox_id_str[TOX_ADDRESS_SIZE * 2];
     tox_self_get_address(tox, tox_id);
     to_hex(tox_id_str, tox_id, TOX_ADDRESS_SIZE);
-    ck_assert_msg(strncmp(tox_id_str, TOX_ID, TOX_ADDRESS_SIZE * 2) == 0, "tox ids do not match, expected %s got %s",
-                  TOX_ID, tox_id_str);
+    ck_assert_msg(strncmp(tox_id_str, EXPECTED_TOX_ID, TOX_ADDRESS_SIZE * 2) == 0,
+                  "tox ids do not match, expected %s got %s", EXPECTED_TOX_ID, tox_id_str);
 
     tox_kill(tox);
 }
@@ -133,7 +136,7 @@ int main(int argc, char *argv[])
     }
 
     char save_path[4096];
-    snprintf(save_path, sizeof(save_path), "%s/%s", base_path, SAVE_FILE);
+    snprintf(save_path, sizeof(save_path), "%s/%s", base_path, LOADED_SAVE_FILE);
 
     test_save_compatibility(save_path);