aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ippair-storage: convert unittests to FAIL/PASS APIs

Browse Source 
Ticket: #6315
pull/14104/head
Olusegun Fajobi 3 weeks ago committed by Victor Julien
parent 0990c9dbf6
commit 66d4595349
1 changed files with 39 additions and 108 deletions
Show Stats Download Patch File Download Diff File

147
src/ippair-storage.c
Unescape Escape View File

@ -80,18 +80,14 @@ static int IPPairStorageTest01(void)
StorageInit(); StorageInit();
IPPairStorageId id1 = IPPairStorageRegister("test", 8, StorageTestAlloc, StorageTestFree); IPPairStorageId id1 = IPPairStorageRegister("test", 8, StorageTestAlloc, StorageTestFree);
if (id1.id < 0) FAIL_IF(id1.id < 0);
goto error;
IPPairStorageId id2 = IPPairStorageRegister("variable", 24, StorageTestAlloc, StorageTestFree); IPPairStorageId id2 = IPPairStorageRegister("variable", 24, StorageTestAlloc, StorageTestFree);
if (id2.id < 0) FAIL_IF(id2.id < 0);
goto error;
IPPairStorageId id3 = IPPairStorageId id3 =
IPPairStorageRegister("store", sizeof(void *), StorageTestAlloc, StorageTestFree); IPPairStorageRegister("store", sizeof(void *), StorageTestAlloc, StorageTestFree);
if (id3.id < 0) FAIL_IF(id3.id < 0);
goto error;
if (StorageFinalize() < 0) FAIL_IF(StorageFinalize() < 0);
goto error;
IPPairInitConfig(1); IPPairInitConfig(1);
@ -103,59 +99,33 @@ static int IPPairStorageTest01(void)
a.family = AF_INET; a.family = AF_INET;
b.family = AF_INET; b.family = AF_INET;
IPPair *h = IPPairGetIPPairFromHash(&a, &b); IPPair *h = IPPairGetIPPairFromHash(&a, &b);
if (h == NULL) { FAIL_IF_NULL(h);
printf("failed to get ippair: ");
goto error;
}
void *ptr = IPPairGetStorageById(h, id1); void *ptr = IPPairGetStorageById(h, id1);
if (ptr != NULL) { FAIL_IF_NOT_NULL(ptr);
goto error;
}
ptr = IPPairGetStorageById(h, id2); ptr = IPPairGetStorageById(h, id2);
if (ptr != NULL) { FAIL_IF_NOT_NULL(ptr);
goto error;
}
ptr = IPPairGetStorageById(h, id3); ptr = IPPairGetStorageById(h, id3);
if (ptr != NULL) { FAIL_IF_NOT_NULL(ptr);
goto error;
}
void *ptr1a = IPPairAllocStorageById(h, id1); void *ptr1a = IPPairAllocStorageById(h, id1);
if (ptr1a == NULL) { FAIL_IF(ptr1a == NULL);
goto error;
}
void *ptr2a = IPPairAllocStorageById(h, id2); void *ptr2a = IPPairAllocStorageById(h, id2);
if (ptr2a == NULL) { FAIL_IF(ptr2a == NULL);
goto error;
}
void *ptr3a = IPPairAllocStorageById(h, id3); void *ptr3a = IPPairAllocStorageById(h, id3);
if (ptr3a == NULL) { FAIL_IF(ptr3a == NULL);
goto error;
}
void *ptr1b = IPPairGetStorageById(h, id1); void *ptr1b = IPPairGetStorageById(h, id1);
if (ptr1a != ptr1b) { FAIL_IF(ptr1a != ptr1b);
goto error;
}
void *ptr2b = IPPairGetStorageById(h, id2); void *ptr2b = IPPairGetStorageById(h, id2);
if (ptr2a != ptr2b) { FAIL_IF(ptr2a != ptr2b);
goto error;
}
void *ptr3b = IPPairGetStorageById(h, id3); void *ptr3b = IPPairGetStorageById(h, id3);
if (ptr3a != ptr3b) { FAIL_IF(ptr3a != ptr3b);
goto error;
}
IPPairRelease(h); IPPairRelease(h);
IPPairShutdown();
StorageCleanup();
return 1;
error:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return 0; PASS;
} }
static int IPPairStorageTest02(void) static int IPPairStorageTest02(void)
@ -164,11 +134,9 @@ static int IPPairStorageTest02(void)
StorageInit(); StorageInit();
IPPairStorageId id1 = IPPairStorageRegister("test", sizeof(void *), NULL, StorageTestFree); IPPairStorageId id1 = IPPairStorageRegister("test", sizeof(void *), NULL, StorageTestFree);
if (id1.id < 0) FAIL_IF(id1.id < 0);
goto error;
if (StorageFinalize() < 0) FAIL_IF(StorageFinalize() < 0);
goto error;
IPPairInitConfig(1); IPPairInitConfig(1);
@ -180,36 +148,23 @@ static int IPPairStorageTest02(void)
a.family = AF_INET; a.family = AF_INET;
b.family = AF_INET; b.family = AF_INET;
IPPair *h = IPPairGetIPPairFromHash(&a, &b); IPPair *h = IPPairGetIPPairFromHash(&a, &b);
if (h == NULL) { FAIL_IF(h == NULL);
printf("failed to get ippair: ");
goto error;
}
void *ptr = IPPairGetStorageById(h, id1); void *ptr = IPPairGetStorageById(h, id1);
if (ptr != NULL) { FAIL_IF_NOT_NULL(ptr);
goto error;
}
void *ptr1a = SCMalloc(128); void *ptr1a = SCMalloc(128);
if (unlikely(ptr1a == NULL)) { FAIL_IF(ptr1a == NULL);
goto error;
}
IPPairSetStorageById(h, id1, ptr1a); IPPairSetStorageById(h, id1, ptr1a);
void *ptr1b = IPPairGetStorageById(h, id1); void *ptr1b = IPPairGetStorageById(h, id1);
if (ptr1a != ptr1b) { FAIL_IF(ptr1a != ptr1b);
goto error;
}
IPPairRelease(h); IPPairRelease(h);
IPPairShutdown();
StorageCleanup();
return 1;
error:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return 0; PASS;
} }
static int IPPairStorageTest03(void) static int IPPairStorageTest03(void)
@ -218,17 +173,13 @@ static int IPPairStorageTest03(void)
StorageInit(); StorageInit();
IPPairStorageId id1 = IPPairStorageRegister("test1", sizeof(void *), NULL, StorageTestFree); IPPairStorageId id1 = IPPairStorageRegister("test1", sizeof(void *), NULL, StorageTestFree);
if (id1.id < 0) FAIL_IF(id1.id < 0);
goto error;
IPPairStorageId id2 = IPPairStorageRegister("test2", sizeof(void *), NULL, StorageTestFree); IPPairStorageId id2 = IPPairStorageRegister("test2", sizeof(void *), NULL, StorageTestFree);
if (id2.id < 0) FAIL_IF(id2.id < 0);
goto error;
IPPairStorageId id3 = IPPairStorageRegister("test3", 32, StorageTestAlloc, StorageTestFree); IPPairStorageId id3 = IPPairStorageRegister("test3", 32, StorageTestAlloc, StorageTestFree);
if (id3.id < 0) FAIL_IF(id3.id < 0);
goto error;
if (StorageFinalize() < 0) FAIL_IF(StorageFinalize() < 0);
goto error;
IPPairInitConfig(1); IPPairInitConfig(1);
@ -240,55 +191,35 @@ static int IPPairStorageTest03(void)
a.family = AF_INET; a.family = AF_INET;
b.family = AF_INET; b.family = AF_INET;
IPPair *h = IPPairGetIPPairFromHash(&a, &b); IPPair *h = IPPairGetIPPairFromHash(&a, &b);
if (h == NULL) { FAIL_IF(h == NULL);
printf("failed to get ippair: ");
goto error;
}
void *ptr = IPPairGetStorageById(h, id1); void *ptr = IPPairGetStorageById(h, id1);
if (ptr != NULL) { FAIL_IF_NOT_NULL(ptr);
goto error;
}
void *ptr1a = SCMalloc(128); void *ptr1a = SCMalloc(128);
if (unlikely(ptr1a == NULL)) { FAIL_IF(ptr1a == NULL);
goto error;
}
IPPairSetStorageById(h, id1, ptr1a); IPPairSetStorageById(h, id1, ptr1a);
void *ptr2a = SCMalloc(256); void *ptr2a = SCMalloc(256);
if (unlikely(ptr2a == NULL)) { FAIL_IF(ptr2a == NULL);
goto error;
}
IPPairSetStorageById(h, id2, ptr2a); IPPairSetStorageById(h, id2, ptr2a);
void *ptr3a = IPPairAllocStorageById(h, id3); void *ptr3a = IPPairAllocStorageById(h, id3);
if (ptr3a == NULL) { FAIL_IF(ptr3a == NULL);
goto error;
}
void *ptr1b = IPPairGetStorageById(h, id1); void *ptr1b = IPPairGetStorageById(h, id1);
if (ptr1a != ptr1b) { FAIL_IF(ptr1a != ptr1b);
goto error;
}
void *ptr2b = IPPairGetStorageById(h, id2); void *ptr2b = IPPairGetStorageById(h, id2);
if (ptr2a != ptr2b) { FAIL_IF(ptr2a != ptr2b);
goto error;
}
void *ptr3b = IPPairGetStorageById(h, id3); void *ptr3b = IPPairGetStorageById(h, id3);
if (ptr3a != ptr3b) { FAIL_IF(ptr3a != ptr3b);
goto error;
}
IPPairRelease(h); IPPairRelease(h);
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return 1; PASS;
error:
IPPairShutdown();
StorageCleanup();
return 0;
} }
#endif #endif
@ -299,4 +230,4 @@ void RegisterIPPairStorageTests(void)
UtRegisterTest("IPPairStorageTest02", IPPairStorageTest02); UtRegisterTest("IPPairStorageTest02", IPPairStorageTest02);
UtRegisterTest("IPPairStorageTest03", IPPairStorageTest03); UtRegisterTest("IPPairStorageTest03", IPPairStorageTest03);
#endif #endif
} }
Write Preview
Loading…
Cancel
Save