Chewing_Bever
/
lander
1
0
Fork 0
Code Issues 30 Packages Projects 1 Activity

fix: make tests work with new trie

generic-data-trie
Jef Roosens 2022-12-08 12:12:29 +01:00
parent 0c742f45b0
commit d7d4821b66
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
4 changed files with 71 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trie/include/trie.h
View File

@ -81,6 +81,18 @@ TrieExitCode trie_search(Trie *trie, void **data_ptr, const char *key);
TrieExitCode trie_add(Trie *trie, const char *key, void *data, TrieExitCode trie_add(Trie *trie, const char *key, void *data,
uint64_t data_len); uint64_t data_len);
/**
* Same as trie_add, but copy the data instead of taking over ownership of the
* pointer.
*
* @param trie
* @param key key to represent entry with
* @param entry entry to add
* @return 0 if added, 1 if already in trie, something else if other errors
*/
TrieExitCode trie_add_copy(Trie *trie, const char *key, void *data,
uint64_t data_len);
/** /**
* Add an entry by generating a random string as the key. * Add an entry by generating a random string as the key.
* *

14
trie/src/trie.c
View File

@ -339,6 +339,20 @@ TrieExitCode trie_add_random(Trie *trie, char **key_ptr, void *data,
return return_value; return return_value;
} }
TrieExitCode trie_add_copy(Trie *trie, const char *key, void *data,
uint64_t data_len) {
void *owned_data = malloc(data_len);
memcpy(owned_data, data, data_len);
TrieExitCode result = trie_add(trie, key, owned_data, data_len);
if (result != Ok) {
free(owned_data);
}
return result;
}
/** /**
* Remove the given string from a Trie. * Remove the given string from a Trie.
* *

5
trie/test/fuzzy.h
View File

@ -114,9 +114,10 @@ int fuzzy_test_trie_seed(FuzzyConfig conf) {
// 4: bad size after removes // 4: bad size after removes
int exit_code = 0; int exit_code = 0;
char payload[1] = "";
// Add all strings to trie, checking for duplicates // Add all strings to trie, checking for duplicates
for (int i = 0; i < conf.word_count; i++) { for (int i = 0; i < conf.word_count; i++) {
status = trie_add(ct, matrix[i], NULL); status = trie_add_copy(ct, matrix[i], &payload, 1);
// if changed is false, *contains_dedupped[i] should be true, as changed // if changed is false, *contains_dedupped[i] should be true, as changed
// can only be false if the string is already contained in the trie. if // can only be false if the string is already contained in the trie. if
@ -135,7 +136,7 @@ int fuzzy_test_trie_seed(FuzzyConfig conf) {
// Ensure size is correct // Ensure size is correct
if (trie_size(ct) != size) { if (trie_size(ct) != size) {
printf("%i %i\n", trie_size(ct), size); printf("%lu %lu\n", trie_size(ct), size);
exit_code = 3; exit_code = 3;
goto END; goto END;
} }

93
trie/test/test_trie.c
View File

@ -20,16 +20,14 @@ void test_init() {
void test_add_one() { void test_add_one() {
TRIE_INIT(); TRIE_INIT();
Entry *entry = entry_new(Redirect, "");
const char* string = "this is a test"; const char* string = "this is a test";
TEST_CHECK(trie_add(ct, string, entry) == Ok); TEST_CHECK(trie_add_copy(ct, string, "", 1) == Ok);
Entry *entry2; void *data;
TEST_CHECK(trie_search(ct, &entry2, string) == Ok); TEST_CHECK(trie_search(ct, &data, string) == Ok);
TEST_CHECK(entry == entry2); TEST_CHECK(memcmp(data, "", 1) == 0);
TEST_SIZE(ct, 1); TEST_SIZE(ct, 1);
entry_free(entry);
trie_free(ct); trie_free(ct);
} }
@ -39,32 +37,27 @@ void test_add_prefix() {
const char *s1 = "halloween-2022"; const char *s1 = "halloween-2022";
const char *s2 = "halloween-202"; const char *s2 = "halloween-202";
Entry *entry1 = entry_new(Redirect, ""); TEST_CHECK(trie_add_copy(ct, s1, "a", 2) == Ok);
Entry *entry2 = entry_new(Redirect, ""); TEST_CHECK(trie_add_copy(ct, s2, "b", 2) == Ok);
TEST_CHECK(trie_add(ct, s1, entry1) == Ok); void *data;
TEST_CHECK(trie_add(ct, s2, entry2) == Ok);
Entry *entry3; TEST_CHECK(trie_search(ct, &data, s1) == Ok);
TEST_CHECK(memcmp(data, "a", 2) == 0);
data = NULL;
TEST_CHECK(trie_search(ct, &entry3, s1) == Ok); TEST_CHECK(trie_search(ct, &data, s2) == Ok);
TEST_CHECK(entry3 == entry1); TEST_CHECK(memcmp(data, "b", 2) == 0);
entry2 = NULL;
TEST_CHECK(trie_search(ct, &entry3, s2) == Ok);
TEST_CHECK(entry3 == entry2);
entry_free(entry1);
entry_free(entry2);
trie_free(ct); trie_free(ct);
} }
void test_search_not_present() { void test_search_not_present() {
TRIE_INIT(); TRIE_INIT();
TEST_CHECK(trie_add(ct, "this string exists", NULL) == Ok); TEST_CHECK(trie_add_copy(ct, "this string exists", "", 1) == Ok);
Entry *entry; void *data;
TEST_CHECK(trie_search(ct, &entry, "this string does not exist") == NotFound); TEST_CHECK(trie_search(ct, &data, "this string does not exist") == NotFound);
trie_free(ct); trie_free(ct);
} }
@ -77,38 +70,34 @@ void test_add_more() {
const char* twenty = "twenty"; const char* twenty = "twenty";
const char* twentytwo = "twentytwo"; const char* twentytwo = "twentytwo";
Entry *entry = entry_new(Redirect, ""); TEST_CHECK(trie_add_copy(ct, one, "a", 2) == Ok);
TEST_CHECK(trie_add_copy(ct, two, "b", 2) == Ok);
TEST_CHECK(trie_add(ct, one, entry) == Ok); TEST_CHECK(trie_add_copy(ct, twenty, "c", 2) == Ok);
TEST_CHECK(trie_add(ct, two, entry) == Ok); TEST_CHECK(trie_add_copy(ct, twentytwo, "d", 2) == Ok);
TEST_CHECK(trie_add(ct, twenty, entry) == Ok);
TEST_CHECK(trie_add(ct, twentytwo, entry) == Ok);
TEST_SIZE(ct, 4); TEST_SIZE(ct, 4);
Entry *entry2; void *data;
TEST_CHECK(trie_search(ct, &entry2, one) == Ok); TEST_CHECK(trie_search(ct, &data, one) == Ok);
TEST_CHECK(entry2 == entry); TEST_CHECK(memcmp(data, "a", 2) == 0);
entry2 = NULL; data = NULL;
TEST_CHECK(trie_search(ct, &entry2, two) == Ok); TEST_CHECK(trie_search(ct, &data, two) == Ok);
TEST_CHECK(entry2 == entry); TEST_CHECK(memcmp(data, "b", 2) == 0);
entry2 = NULL; data = NULL;
TEST_CHECK(trie_search(ct, &entry2, twenty) == Ok); TEST_CHECK(trie_search(ct, &data, twenty) == Ok);
TEST_CHECK(entry2 == entry); TEST_CHECK(memcmp(data, "c", 2) == 0);
entry2 = NULL; data = NULL;
TEST_CHECK(trie_search(ct, &entry2, twentytwo) == Ok); TEST_CHECK(trie_search(ct, &data, twentytwo) == Ok);
TEST_CHECK(entry2 == entry); TEST_CHECK(memcmp(data, "d", 2) == 0);
entry2 = NULL;
TEST_CHECK(trie_add(ct, one, NULL) == AlreadyPresent); TEST_CHECK(trie_add_copy(ct, one, "", 2) == AlreadyPresent);
TEST_CHECK(trie_add(ct, two, NULL) == AlreadyPresent); TEST_CHECK(trie_add_copy(ct, two, "", 2) == AlreadyPresent);
TEST_CHECK(trie_add(ct, twenty, NULL) == AlreadyPresent); TEST_CHECK(trie_add_copy(ct, twenty, "", 2) == AlreadyPresent);
TEST_CHECK(trie_add(ct, twentytwo, NULL) == AlreadyPresent); TEST_CHECK(trie_add_copy(ct, twentytwo, "", 2) == AlreadyPresent);
entry_free(entry);
trie_free(ct); trie_free(ct);
} }
@ -117,7 +106,7 @@ void test_add_more() {
/* TEST_CHECK(ct != NULL); */ /* TEST_CHECK(ct != NULL); */
/* const char* string = "this is a test"; */ /* const char* string = "this is a test"; */
/* TEST_CHECK(trie_add(ct, string, NULL)); */ /* TEST_CHECK(trie_add_copy(ct, string, NULL)); */
/* TEST_SIZE(ct, 1); */ /* TEST_SIZE(ct, 1); */
/* TEST_CHECK(trie_remove(ct, string)); */ /* TEST_CHECK(trie_remove(ct, string)); */
@ -134,10 +123,10 @@ void test_add_more() {
/* const char* two = "two"; */ /* const char* two = "two"; */
/* const char* twenty = "twenty"; */ /* const char* twenty = "twenty"; */
/* const char* twentytwo = "twentytwo"; */ /* const char* twentytwo = "twentytwo"; */
/* TEST_CHECK(trie_add(ct, one, NULL)); */ /* TEST_CHECK(trie_add_copy(ct, one, NULL)); */
/* TEST_CHECK(trie_add(ct, two, NULL)); */ /* TEST_CHECK(trie_add_copy(ct, two, NULL)); */
/* TEST_CHECK(trie_add(ct, twenty, NULL)); */ /* TEST_CHECK(trie_add_copy(ct, twenty, NULL)); */
/* TEST_CHECK(trie_add(ct, twentytwo, NULL)); */ /* TEST_CHECK(trie_add_copy(ct, twentytwo, NULL)); */
/* TEST_SIZE(ct, 4); */ /* TEST_SIZE(ct, 4); */
@ -155,7 +144,7 @@ void test_add_more() {
/* Trie* ct = trie_init(); */ /* Trie* ct = trie_init(); */
/* TEST_CHECK(ct != NULL); */ /* TEST_CHECK(ct != NULL); */
/* TEST_CHECK(trie_add(ct, "this string exists", NULL)); */ /* TEST_CHECK(trie_add_copy(ct, "this string exists", NULL)); */
/* TEST_CHECK(!trie_remove(ct, "this string does not exist")); */ /* TEST_CHECK(!trie_remove(ct, "this string does not exist")); */
/* trie_free(ct); */ /* trie_free(ct); */