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

ippair-bit: Convert unittests to FAIL/PASS APIs

Browse Source 
Ticket: #6323
pull/14067/head
Olusegun Fajobi 4 weeks ago committed by Victor Julien
parent b090fc61fd
commit 2db1b93332
1 changed files with 38 additions and 116 deletions
Show Stats Download Patch File Download Diff File

154
src/ippair-bit.c
Unescape Escape View File

@ -188,104 +188,79 @@ int IPPairBitIsnotset(IPPair *h, uint32_t idx, SCTime_t ts)
#ifdef UNITTESTS #ifdef UNITTESTS
static int IPPairBitTest01 (void) static int IPPairBitTest01 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(0)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(0));
XBit *fb = IPPairBitGet(h,0); XBit *fb = IPPairBitGet(h,0);
if (fb != NULL) FAIL_IF_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest02 (void) static int IPPairBitTest02 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
XBit *fb = IPPairBitGet(h,0); XBit *fb = IPPairBitGet(h,0);
if (fb == NULL) FAIL_IF_NOT_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest03 (void) static int IPPairBitTest03 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(30)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(30));
XBit *fb = IPPairBitGet(h,0); XBit *fb = IPPairBitGet(h,0);
if (fb == NULL) { FAIL_IF_NULL(fb);
printf("fb == NULL although it was just added: ");
goto end;
}
IPPairBitRemove(h, 0); IPPairBitRemove(h, 0);
fb = IPPairBitGet(h,0); fb = IPPairBitGet(h,0);
if (fb != NULL) { FAIL_IF_NOT_NULL(fb);
printf("fb != NULL although it was just removed: ");
goto end;
} else {
ret = 1;
}
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest04 (void) static int IPPairBitTest04 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(30)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(30));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(30)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(30));
@ -293,28 +268,23 @@ static int IPPairBitTest04 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(30)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(30));
XBit *fb = IPPairBitGet(h,0); XBit *fb = IPPairBitGet(h,0);
if (fb != NULL) FAIL_IF_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest05 (void) static int IPPairBitTest05 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -322,28 +292,23 @@ static int IPPairBitTest05 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,1); XBit *fb = IPPairBitGet(h,1);
if (fb != NULL) FAIL_IF_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest06 (void) static int IPPairBitTest06 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -351,28 +316,23 @@ static int IPPairBitTest06 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,2); XBit *fb = IPPairBitGet(h,2);
if (fb != NULL) FAIL_IF_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest07 (void) static int IPPairBitTest07 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -380,28 +340,23 @@ static int IPPairBitTest07 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,3); XBit *fb = IPPairBitGet(h,3);
if (fb != NULL) FAIL_IF_NULL(fb);
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest08 (void) static int IPPairBitTest08 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -409,37 +364,28 @@ static int IPPairBitTest08 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,0); XBit *fb = IPPairBitGet(h,0);
if (fb == NULL) FAIL_IF_NULL(fb);
goto end;
IPPairBitRemove(h,0); IPPairBitRemove(h,0);
fb = IPPairBitGet(h,0); fb = IPPairBitGet(h,0);
if (fb != NULL) { FAIL_IF_NOT_NULL(fb);
printf("fb != NULL even though it was removed: ");
goto end;
}
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest09 (void) static int IPPairBitTest09 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -447,37 +393,28 @@ static int IPPairBitTest09 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,1); XBit *fb = IPPairBitGet(h,1);
if (fb == NULL) FAIL_IF_NULL(fb);
goto end;
IPPairBitRemove(h,1); IPPairBitRemove(h,1);
fb = IPPairBitGet(h,1); fb = IPPairBitGet(h,1);
if (fb != NULL) { FAIL_IF_NOT_NULL(fb);
printf("fb != NULL even though it was removed: ");
goto end;
}
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest10 (void) static int IPPairBitTest10 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -485,37 +422,28 @@ static int IPPairBitTest10 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,2); XBit *fb = IPPairBitGet(h,2);
if (fb == NULL) FAIL_IF_NULL(fb);
goto end;
IPPairBitRemove(h,2); IPPairBitRemove(h,2);
fb = IPPairBitGet(h,2); fb = IPPairBitGet(h,2);
if (fb != NULL) { FAIL_IF_NOT_NULL(fb);
printf("fb != NULL even though it was removed: ");
goto end;
}
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
static int IPPairBitTest11 (void) static int IPPairBitTest11 (void)
{ {
int ret = 0;
StorageCleanup(); StorageCleanup();
StorageInit(); StorageInit();
IPPairBitInitCtx(); IPPairBitInitCtx();
StorageFinalize(); StorageFinalize();
IPPairInitConfig(true); IPPairInitConfig(true);
IPPair *h = IPPairAlloc(); IPPair *h = IPPairAlloc();
if (h == NULL) FAIL_IF_NULL(h);
goto end;
IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 0, SCTIME_FROM_SECS(90));
IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 1, SCTIME_FROM_SECS(90));
@ -523,23 +451,17 @@ static int IPPairBitTest11 (void)
IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90)); IPPairBitAdd(h, 3, SCTIME_FROM_SECS(90));
XBit *fb = IPPairBitGet(h,3); XBit *fb = IPPairBitGet(h,3);
if (fb == NULL) FAIL_IF_NULL(fb);
goto end;
IPPairBitRemove(h,3); IPPairBitRemove(h,3);
fb = IPPairBitGet(h,3); fb = IPPairBitGet(h,3);
if (fb != NULL) { FAIL_IF_NOT_NULL(fb);
printf("fb != NULL even though it was removed: ");
goto end;
}
ret = 1;
IPPairFree(h); IPPairFree(h);
end:
IPPairShutdown(); IPPairShutdown();
StorageCleanup(); StorageCleanup();
return ret; PASS;
} }
#endif /* UNITTESTS */ #endif /* UNITTESTS */

Write Preview
Loading…
Cancel
Save