Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: Remove old check Suite compat layer. #1900

Merged
merged 1 commit into from
Jan 16, 2022
Merged

cleanup: Remove old check Suite compat layer. #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ auto_test(save_load)
auto_test(send_message)
auto_test(set_name)
auto_test(set_status_message)
auto_test(skeleton)
auto_test(tox_many)
auto_test(tox_many_tcp)
auto_test(tox_one)
Expand Down
1 change: 0 additions & 1 deletion auto_tests/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ TESTS = \
send_message_test \
set_name_test \
set_status_message_test \
skeleton_test \
TCP_test \
tox_many_tcp_test \
tox_many_test \
Expand Down
50 changes: 16 additions & 34 deletions auto_tests/TCP_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static void do_TCP_server_delay(TCP_Server *tcp_s, Mono_Time *mono_time, int del
}
static uint16_t ports[NUM_PORTS] = {13215, 33445, 25643};

START_TEST(test_basic)
static void test_basic(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -172,7 +172,6 @@ START_TEST(test_basic)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

struct sec_TCP_con {
Socket sock;
Expand Down Expand Up @@ -241,7 +240,7 @@ static void kill_TCP_con(struct sec_TCP_con *con)
free(con);
}

static int write_packet_TCP_secure_connection(struct sec_TCP_con *con, uint8_t *data, uint16_t length)
static int write_packet_TCP_secure_connection(struct sec_TCP_con *con, const uint8_t *data, uint16_t length)
{
VLA(uint8_t, packet, sizeof(uint16_t) + length + CRYPTO_MAC_SIZE);

Expand Down Expand Up @@ -269,7 +268,7 @@ static int read_packet_sec_TCP(struct sec_TCP_con *con, uint8_t *data, uint16_t
return rlen;
}

START_TEST(test_some)
static void test_some(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -375,7 +374,6 @@ START_TEST(test_some)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

static int response_callback_good;
static uint8_t response_callback_connection_id;
Expand Down Expand Up @@ -458,7 +456,7 @@ static int oob_data_callback(void *object, const uint8_t *public_key, const uint
return 1;
}

START_TEST(test_client)
static void test_client(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -584,10 +582,9 @@ START_TEST(test_client)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

// Test how the client handles servers that don't respond.
START_TEST(test_client_invalid)
static void test_client_invalid(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -632,7 +629,6 @@ START_TEST(test_client_invalid)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

#include "../toxcore/TCP_connection.h"

Expand Down Expand Up @@ -660,7 +656,7 @@ static int tcp_data_callback(void *object, int id, const uint8_t *data, uint16_t
}


START_TEST(test_tcp_connection)
static void test_tcp_connection(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -744,7 +740,6 @@ START_TEST(test_tcp_connection)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

static bool tcp_oobdata_callback_called;
static int tcp_oobdata_callback(void *object, const uint8_t *public_key, unsigned int id, const uint8_t *data,
Expand All @@ -767,7 +762,7 @@ static int tcp_oobdata_callback(void *object, const uint8_t *public_key, unsigne
return 0;
}

START_TEST(test_tcp_connection2)
static void test_tcp_connection2(void)
{
Mono_Time *mono_time = mono_time_new();
Logger *logger = logger_new();
Expand Down Expand Up @@ -846,33 +841,20 @@ START_TEST(test_tcp_connection2)
logger_kill(logger);
mono_time_free(mono_time);
}
END_TEST

static Suite *TCP_suite(void)
static void TCP_suite(void)
{
Suite *s = suite_create("TCP");

DEFTESTCASE_SLOW(basic, 5);
DEFTESTCASE_SLOW(some, 10);
DEFTESTCASE_SLOW(client, 10);
DEFTESTCASE_SLOW(client_invalid, 15);
DEFTESTCASE_SLOW(tcp_connection, 20);
DEFTESTCASE_SLOW(tcp_connection2, 20);
return s;
test_basic();
test_some();
test_client();
test_client_invalid();
test_tcp_connection();
test_tcp_connection2();
}

int main(void)
{
setvbuf(stdout, nullptr, _IONBF, 0);

Suite *TCP = TCP_suite();
SRunner *test_runner = srunner_create(TCP);

int number_failed = 0;
srunner_run_all(test_runner, CK_NORMAL);
number_failed = srunner_ntests_failed(test_runner);

srunner_free(test_runner);

return number_failed;
TCP_suite();
return 0;
}
35 changes: 0 additions & 35 deletions auto_tests/check_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,9 @@

#include "../toxcore/ccompat.h"

#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>

#define START_TEST(name) static void name(void)
#define END_TEST

#define DEFTESTCASE(NAME) test_##NAME()
#define DEFTESTCASE_SLOW(NAME, TIMEOUT) test_##NAME()

typedef struct Suite Suite;
typedef struct SRunner SRunner;
enum SRunMode { CK_NORMAL };

static inline Suite *suite_create(const char *title)
{
printf("Running test suite: %s\n", title);
return nullptr;
}

static inline SRunner *srunner_create(Suite *s)
{
return nullptr;
}

static inline void srunner_free(SRunner *s)
{
}

static inline void srunner_run_all(SRunner *r, int mode)
{
}

static inline int srunner_ntests_failed(SRunner *r)
{
return 0;
}

#define ck_assert(ok) do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s'\n", __FILE__, __LINE__, #ok); \
Expand Down
53 changes: 15 additions & 38 deletions auto_tests/crypto_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static const unsigned char test_c[147] = {
0xe3, 0x55, 0xa5
};

START_TEST(test_known)
static void test_known(void)
{
unsigned char c[147];
unsigned char m[131];
Expand All @@ -101,9 +101,8 @@ START_TEST(test_known)
ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
ck_assert_msg(mlen == sizeof(m) / sizeof(unsigned char), "wrong plaintext length");
}
END_TEST

START_TEST(test_fast_known)
static void test_fast_known(void)
{
unsigned char k[CRYPTO_SHARED_KEY_SIZE];
unsigned char c[147];
Expand All @@ -127,9 +126,8 @@ START_TEST(test_fast_known)
ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
ck_assert_msg(mlen == sizeof(m) / sizeof(unsigned char), "wrong plaintext length");
}
END_TEST

START_TEST(test_endtoend)
static void test_endtoend(void)
{
// Test 100 random messages and keypairs
for (uint8_t testno = 0; testno < 100; testno++) {
Expand Down Expand Up @@ -191,9 +189,8 @@ START_TEST(test_endtoend)
ck_assert_msg(memcmp(m1, m, mlen) == 0, "wrong decrypted text");
}
}
END_TEST

START_TEST(test_large_data)
static void test_large_data(void)
{
unsigned char k[CRYPTO_SHARED_KEY_SIZE];

Expand Down Expand Up @@ -228,9 +225,8 @@ START_TEST(test_large_data)
ck_assert_msg(m1plen == sizeof(m1), "decrypted text lengths differ");
ck_assert_msg(memcmp(m1prime, m1, sizeof(m1)) == 0, "decrypted texts differ");
}
END_TEST

START_TEST(test_large_data_symmetric)
static void test_large_data_symmetric(void)
{
unsigned char k[CRYPTO_SYMMETRIC_KEY_SIZE];

Expand Down Expand Up @@ -258,7 +254,6 @@ START_TEST(test_large_data_symmetric)
ck_assert_msg(m1plen == sizeof(m1), "decrypted text lengths differ");
ck_assert_msg(memcmp(m1prime, m1, sizeof(m1)) == 0, "decrypted texts differ");
}
END_TEST

static void increment_nonce_number_cmp(uint8_t *nonce, uint32_t num)
{
Expand All @@ -281,7 +276,7 @@ static void increment_nonce_number_cmp(uint8_t *nonce, uint32_t num)
memcpy(nonce + (CRYPTO_NONCE_SIZE - sizeof(num2)), &num2, sizeof(num2));
}

START_TEST(test_increment_nonce)
static void test_increment_nonce(void)
{
uint32_t i;

Expand All @@ -308,9 +303,8 @@ START_TEST(test_increment_nonce)
ck_assert_msg(memcmp(n, n1, CRYPTO_NONCE_SIZE) == 0, "Bad increment_nonce_number function");
}
}
END_TEST

START_TEST(test_memzero)
static void test_memzero(void)
{
uint8_t src[sizeof(test_c)];
memcpy(src, test_c, sizeof(test_c));
Expand All @@ -322,35 +316,18 @@ START_TEST(test_memzero)
ck_assert_msg(src[i] == 0, "Memory is not zeroed");
}
}
END_TEST

static Suite *crypto_suite(void)
{
Suite *s = suite_create("Crypto");

DEFTESTCASE(known);
DEFTESTCASE(fast_known);
DEFTESTCASE_SLOW(endtoend, 15); /* waiting up to 15 seconds */
DEFTESTCASE(large_data);
DEFTESTCASE(large_data_symmetric);
DEFTESTCASE_SLOW(increment_nonce, 20);
DEFTESTCASE(memzero);

return s;
}

int main(void)
{
setvbuf(stdout, nullptr, _IONBF, 0);

Suite *crypto = crypto_suite();
SRunner *test_runner = srunner_create(crypto);
uint8_t number_failed = 0;

srunner_run_all(test_runner, CK_NORMAL);
number_failed = srunner_ntests_failed(test_runner);

srunner_free(test_runner);
test_known();
test_fast_known();
test_endtoend(); /* waiting up to 15 seconds */
test_large_data();
test_large_data_symmetric();
test_increment_nonce();
test_memzero();

return number_failed;
return 0;
}
Loading