still working on remove, pushing to be able to work on laptop, started recursive move back, still broke
This commit is contained in:
parent
c175278416
commit
c173519f14
2 changed files with 84 additions and 61 deletions
|
|
@ -14,11 +14,12 @@ void TEST_Hashtable_PrintIter(void *key, void *value){
|
|||
}
|
||||
|
||||
void TEST_Hashtable_Print(void *hashtable){
|
||||
printf("hashtable:\n");
|
||||
ARC_Hashtable_RunIteration(hashtable, TEST_Hashtable_PrintIter);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
ARC_Bool TEST_Hashtable_KeyCompareDataFn(void *dataA, void *dataB){
|
||||
printf("%s, %s\n", (char *)dataA, (char *)dataB);
|
||||
return (ARC_Bool)strcmp((const char *)dataA, (const char *)dataB) == 0;
|
||||
}
|
||||
|
||||
|
|
@ -103,6 +104,9 @@ ARC_TEST(Hashtable_Add_Get_Remove){
|
|||
ARC_CHECK(7 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key1"));
|
||||
ARC_CHECK(1 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key5"));
|
||||
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key1");
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key5");
|
||||
|
||||
ARC_Hashtable_Destroy(hashtable);
|
||||
}
|
||||
|
||||
|
|
@ -136,42 +140,42 @@ ARC_TEST(Hashtable_Add_Get_100){
|
|||
ARC_Hashtable_Destroy(hashtable);
|
||||
}
|
||||
|
||||
//ARC_TEST(Hashtable_Add_Get_Remove_100){
|
||||
// ARC_Hashtable *hashtable;
|
||||
// ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
// ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
// ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
//
|
||||
// const char *keyCStr = "key%03u";
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// int32_t *val = (int32_t *)malloc(sizeof(int32_t));
|
||||
// *val = index;
|
||||
//
|
||||
// ARC_Hashtable_Add(hashtable, key, val);
|
||||
// }
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// ARC_CHECK(index == *(int32_t *)ARC_Hashtable_Get(hashtable, key));
|
||||
//
|
||||
// free(key);
|
||||
// }
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// TEST_Hashtable_Print(hashtable);
|
||||
// ARC_Hashtable_Remove(hashtable, key);
|
||||
//
|
||||
// free(key);
|
||||
// }
|
||||
//
|
||||
// ARC_Hashtable_Destroy(hashtable);
|
||||
//}
|
||||
ARC_TEST(Hashtable_Add_Get_Remove_100){
|
||||
ARC_Hashtable *hashtable;
|
||||
ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
|
||||
const char *keyCStr = "key%03u";
|
||||
uint32_t maxVal = 1000;
|
||||
|
||||
for(uint32_t index = 0; index < maxVal; index++){
|
||||
char *key = (char *)malloc(strlen(keyCStr));
|
||||
sprintf(key, keyCStr, index);
|
||||
|
||||
int32_t *val = (int32_t *)malloc(sizeof(int32_t));
|
||||
*val = index;
|
||||
|
||||
ARC_Hashtable_Add(hashtable, key, val);
|
||||
}
|
||||
|
||||
for(uint32_t index = 0; index < maxVal; index++){
|
||||
char *key = (char *)malloc(strlen(keyCStr));
|
||||
sprintf(key, keyCStr, index);
|
||||
|
||||
ARC_CHECK(index == *(int32_t *)ARC_Hashtable_Get(hashtable, key));
|
||||
|
||||
free(key);
|
||||
}
|
||||
|
||||
for(uint32_t index = 0; index < maxVal; index++){
|
||||
char *key = (char *)malloc(strlen(keyCStr));
|
||||
sprintf(key, keyCStr, index);
|
||||
|
||||
ARC_Hashtable_Remove(hashtable, key);
|
||||
|
||||
free(key);
|
||||
}
|
||||
|
||||
ARC_Hashtable_Destroy(hashtable);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue