detect-filesize: Convert unittests to new FAIL/PASS API

Ticket: 4039
pull/8118/head
Haleema Khan 4 years ago committed by Victor Julien
parent f25d4cc546
commit 160c778a1f

@ -170,81 +170,63 @@ static void DetectFilesizeFree(DetectEngineCtx *de_ctx, void *ptr)
/** \test Test the Filesize keyword setup */ /** \test Test the Filesize keyword setup */
static int DetectFilesizeParseTest01(void) static int DetectFilesizeParseTest01(void)
{ {
int ret = 0; DetectU64Data *fsd = DetectU64Parse("10");
DetectU64Data *fsd = NULL; FAIL_IF_NULL(fsd);
FAIL_IF_NOT(fsd->arg1 == 10);
fsd = DetectU64Parse("10"); FAIL_IF_NOT(fsd->mode == DETECT_UINT_EQ);
if (fsd != NULL) { DetectFilesizeFree(NULL, fsd);
if (fsd->arg1 == 10 && fsd->mode == DETECT_UINT_EQ)
ret = 1;
DetectFilesizeFree(NULL, fsd); PASS;
}
return ret;
} }
/** \test Test the Filesize keyword setup */ /** \test Test the Filesize keyword setup */
static int DetectFilesizeParseTest02(void) static int DetectFilesizeParseTest02(void)
{ {
int ret = 0; DetectU64Data *fsd = DetectU64Parse(" < 10 ");
DetectU64Data *fsd = NULL; FAIL_IF_NULL(fsd);
FAIL_IF_NOT(fsd->arg1 == 10);
fsd = DetectU64Parse(" < 10 "); FAIL_IF_NOT(fsd->mode == DETECT_UINT_LT);
if (fsd != NULL) { DetectFilesizeFree(NULL, fsd);
if (fsd->arg1 == 10 && fsd->mode == DETECT_UINT_LT)
ret = 1;
DetectFilesizeFree(NULL, fsd); PASS;
}
return ret;
} }
/** \test Test the Filesize keyword setup */ /** \test Test the Filesize keyword setup */
static int DetectFilesizeParseTest03(void) static int DetectFilesizeParseTest03(void)
{ {
int ret = 0; DetectU64Data *fsd = DetectU64Parse(" > 10 ");
DetectU64Data *fsd = NULL; FAIL_IF_NULL(fsd);
FAIL_IF_NOT(fsd->arg1 == 10);
FAIL_IF_NOT(fsd->mode == DETECT_UINT_GT);
DetectFilesizeFree(NULL, fsd);
fsd = DetectU64Parse(" > 10 "); PASS;
if (fsd != NULL) {
if (fsd->arg1 == 10 && fsd->mode == DETECT_UINT_GT)
ret = 1;
DetectFilesizeFree(NULL, fsd);
}
return ret;
} }
/** \test Test the Filesize keyword setup */ /** \test Test the Filesize keyword setup */
static int DetectFilesizeParseTest04(void) static int DetectFilesizeParseTest04(void)
{ {
int ret = 0; DetectU64Data *fsd = DetectU64Parse(" 5 <> 10 ");
DetectU64Data *fsd = NULL; FAIL_IF_NULL(fsd);
FAIL_IF_NOT(fsd->arg1 == 5);
fsd = DetectU64Parse(" 5 <> 10 "); FAIL_IF_NOT(fsd->arg2 == 10);
if (fsd != NULL) { FAIL_IF_NOT(fsd->mode == DETECT_UINT_RA);
if (fsd->arg1 == 5 && fsd->arg2 == 10 && fsd->mode == DETECT_UINT_RA) DetectFilesizeFree(NULL, fsd);
ret = 1;
PASS;
DetectFilesizeFree(NULL, fsd);
}
return ret;
} }
/** \test Test the Filesize keyword setup */ /** \test Test the Filesize keyword setup */
static int DetectFilesizeParseTest05(void) static int DetectFilesizeParseTest05(void)
{ {
int ret = 0; DetectU64Data *fsd = DetectU64Parse("5<>10");
DetectU64Data *fsd = NULL; FAIL_IF_NULL(fsd);
FAIL_IF_NOT(fsd->arg1 == 5);
fsd = DetectU64Parse("5<>10"); FAIL_IF_NOT(fsd->arg2 == 10);
if (fsd != NULL) { FAIL_IF_NOT(fsd->mode == DETECT_UINT_RA);
if (fsd->arg1 == 5 && fsd->arg2 == 10 && fsd->mode == DETECT_UINT_RA) DetectFilesizeFree(NULL, fsd);
ret = 1;
PASS;
DetectFilesizeFree(NULL, fsd);
}
return ret;
} }
/** /**
@ -257,36 +239,27 @@ static int DetectFilesizeInitTest(
DetectEngineCtx **de_ctx, Signature **sig, DetectU64Data **fsd, const char *str) DetectEngineCtx **de_ctx, Signature **sig, DetectU64Data **fsd, const char *str)
{ {
char fullstr[1024]; char fullstr[1024];
int result = 0;
*de_ctx = NULL; *de_ctx = NULL;
*sig = NULL;
if (snprintf(fullstr, 1024, "alert http any any -> any any (msg:\"Filesize "
"test\"; filesize:%s; sid:1;)", str) >= 1024) {
goto end;
}
*de_ctx = DetectEngineCtxInit(); *de_ctx = DetectEngineCtxInit();
if (*de_ctx == NULL) {
goto end;
}
(*de_ctx)->flags |= DE_QUIET; (*de_ctx)->flags |= DE_QUIET;
FAIL_IF_NULL((*de_ctx));
(*de_ctx)->sig_list = SigInit(*de_ctx, fullstr); *sig = NULL;
if ((*de_ctx)->sig_list == NULL) {
goto end; FAIL_IF(snprintf(fullstr, 1024,
} "alert http any any -> any any (msg:\"Filesize "
"test\"; filesize:%s; sid:1;)",
str) >= 1024);
Signature *s = DetectEngineAppendSig(*de_ctx, fullstr);
FAIL_IF_NULL(s);
*sig = (*de_ctx)->sig_list; *sig = (*de_ctx)->sig_list;
*fsd = DetectU64Parse(str); *fsd = DetectU64Parse(str);
result = 1; PASS;
end:
return result;
} }
/** /**
@ -305,26 +278,17 @@ static int DetectFilesizeSetpTest01(void)
DetectEngineCtx *de_ctx = NULL; DetectEngineCtx *de_ctx = NULL;
res = DetectFilesizeInitTest(&de_ctx, &sig, &fsd, "1 <> 3 "); res = DetectFilesizeInitTest(&de_ctx, &sig, &fsd, "1 <> 3 ");
if (res == 0) { FAIL_IF(res == 0);
goto end;
}
if(fsd == NULL)
goto cleanup;
if (fsd != NULL) { FAIL_IF_NULL(fsd);
if (fsd->arg1 == 1 && fsd->arg2 == 3 && fsd->mode == DETECT_UINT_RA) FAIL_IF_NOT(fsd->arg1 == 1);
res = 1; FAIL_IF_NOT(fsd->arg2 == 3);
} FAIL_IF_NOT(fsd->mode == DETECT_UINT_RA);
cleanup: DetectFilesizeFree(NULL, fsd);
if (fsd)
DetectFilesizeFree(NULL, fsd);
SigGroupCleanup(de_ctx);
SigCleanSignatures(de_ctx);
DetectEngineCtxFree(de_ctx); DetectEngineCtxFree(de_ctx);
end:
return res; PASS;
} }
/** /**

Loading…
Cancel
Save