Skip to content

Commit a16e87b

Browse files
samfajobivictorjulien
samfajobi
authored and
victorjulien
committed
detect-urilen: convert unittests to FAIL/PASS APIs
Ticket: OISF#6325
1 parent bdf292b commit a16e87b

1 file changed

Lines changed: 85 additions & 134 deletions

File tree

‎src/detect-urilen.c‎

Lines changed: 85 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -253,169 +253,134 @@ bool DetectUrilenValidateContent(
253253
/** \test Test the Urilen keyword setup */
254254
static int DetectUrilenParseTest01(void)
255255
{
256-
int ret = 0;
257-
DetectUrilenData *urilend = NULL;
258-
259-
urilend = DetectUrilenParse("10");
260-
if (urilend != NULL) {
261-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_EQ &&
262-
!urilend->raw_buffer)
263-
ret = 1;
256+
DetectUrilenData *urilend = DetectUrilenParse("10");
257+
FAIL_IF_NULL(urilend);
258+
FAIL_IF(urilend->du16.arg1 != 10);
259+
FAIL_IF(urilend->du16.mode != DETECT_UINT_EQ);
260+
FAIL_IF(urilend->raw_buffer);
264261

265-
DetectUrilenFree(NULL, urilend);
266-
}
267-
return ret;
262+
DetectUrilenFree(NULL, urilend);
263+
PASS;
268264
}
269265

270266
/** \test Test the Urilen keyword setup */
271267
static int DetectUrilenParseTest02(void)
272268
{
273-
int ret = 0;
274-
DetectUrilenData *urilend = NULL;
275-
276-
urilend = DetectUrilenParse(" < 10 ");
277-
if (urilend != NULL) {
278-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_LT &&
279-
!urilend->raw_buffer)
280-
ret = 1;
269+
DetectUrilenData *urilend = DetectUrilenParse(" < 10 ");
270+
FAIL_IF_NULL(urilend);
271+
FAIL_IF(urilend->du16.arg1 != 10);
272+
FAIL_IF(urilend->du16.mode != DETECT_UINT_LT);
273+
FAIL_IF(urilend->raw_buffer);
281274

282-
DetectUrilenFree(NULL, urilend);
283-
}
284-
return ret;
275+
DetectUrilenFree(NULL, urilend);
276+
PASS;
285277
}
286278

287279
/** \test Test the Urilen keyword setup */
288280
static int DetectUrilenParseTest03(void)
289281
{
290-
int ret = 0;
291-
DetectUrilenData *urilend = NULL;
292-
293-
urilend = DetectUrilenParse(" > 10 ");
294-
if (urilend != NULL) {
295-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_GT &&
296-
!urilend->raw_buffer)
297-
ret = 1;
282+
DetectUrilenData *urilend = DetectUrilenParse(" > 10 ");
283+
FAIL_IF_NULL(urilend);
284+
FAIL_IF(urilend->du16.arg1 != 10);
285+
FAIL_IF(urilend->du16.mode != DETECT_UINT_GT);
286+
FAIL_IF(urilend->raw_buffer);
298287

299-
DetectUrilenFree(NULL, urilend);
300-
}
301-
return ret;
288+
DetectUrilenFree(NULL, urilend);
289+
PASS;
302290
}
303291

304292
/** \test Test the Urilen keyword setup */
305293
static int DetectUrilenParseTest04(void)
306294
{
307-
int ret = 0;
308-
DetectUrilenData *urilend = NULL;
309-
310-
urilend = DetectUrilenParse(" 5 <> 10 ");
311-
if (urilend != NULL) {
312-
if (urilend->du16.arg1 == 5 && urilend->du16.arg2 == 10 &&
313-
urilend->du16.mode == DETECT_UINT_RA && !urilend->raw_buffer)
314-
ret = 1;
315-
316-
DetectUrilenFree(NULL, urilend);
317-
}
318-
return ret;
295+
DetectUrilenData *urilend = DetectUrilenParse(" 5 <> 10 ");
296+
FAIL_IF_NULL(urilend);
297+
FAIL_IF(urilend->du16.arg1 != 5);
298+
FAIL_IF(urilend->du16.arg2 != 10);
299+
FAIL_IF(urilend->du16.mode != DETECT_UINT_RA);
300+
FAIL_IF(urilend->raw_buffer);
301+
302+
DetectUrilenFree(NULL, urilend);
303+
PASS;
319304
}
320305

321306
/** \test Test the Urilen keyword setup */
322307
static int DetectUrilenParseTest05(void)
323308
{
324-
int ret = 0;
325-
DetectUrilenData *urilend = NULL;
326-
327-
urilend = DetectUrilenParse("5<>10,norm");
328-
if (urilend != NULL) {
329-
if (urilend->du16.arg1 == 5 && urilend->du16.arg2 == 10 &&
330-
urilend->du16.mode == DETECT_UINT_RA && !urilend->raw_buffer)
331-
ret = 1;
332-
333-
DetectUrilenFree(NULL, urilend);
334-
}
335-
return ret;
309+
DetectUrilenData *urilend = DetectUrilenParse("5<>10,norm");
310+
FAIL_IF_NULL(urilend);
311+
FAIL_IF(urilend->du16.arg1 != 5);
312+
FAIL_IF(urilend->du16.arg2 != 10);
313+
FAIL_IF(urilend->du16.mode != DETECT_UINT_RA);
314+
FAIL_IF(urilend->raw_buffer);
315+
316+
DetectUrilenFree(NULL, urilend);
317+
PASS;
336318
}
337319

338320
/** \test Test the Urilen keyword setup */
339321
static int DetectUrilenParseTest06(void)
340322
{
341-
int ret = 0;
342-
DetectUrilenData *urilend = NULL;
343-
344-
urilend = DetectUrilenParse("5<>10,raw");
345-
if (urilend != NULL) {
346-
if (urilend->du16.arg1 == 5 && urilend->du16.arg2 == 10 &&
347-
urilend->du16.mode == DETECT_UINT_RA && urilend->raw_buffer)
348-
ret = 1;
349-
350-
DetectUrilenFree(NULL, urilend);
351-
}
352-
return ret;
323+
DetectUrilenData *urilend = DetectUrilenParse("5<>10,raw");
324+
FAIL_IF_NULL(urilend);
325+
FAIL_IF(urilend->du16.arg1 != 5);
326+
FAIL_IF(urilend->du16.arg2 != 10);
327+
FAIL_IF(urilend->du16.mode != DETECT_UINT_RA);
328+
FAIL_IF(!urilend->raw_buffer);
329+
330+
DetectUrilenFree(NULL, urilend);
331+
PASS;
353332
}
354333

355334
/** \test Test the Urilen keyword setup */
356335
static int DetectUrilenParseTest07(void)
357336
{
358-
int ret = 0;
359-
DetectUrilenData *urilend = NULL;
337+
DetectUrilenData *urilend = DetectUrilenParse(">10, norm ");
338+
FAIL_IF_NULL(urilend);
339+
FAIL_IF(urilend->du16.arg1 != 10);
340+
FAIL_IF(urilend->du16.mode != DETECT_UINT_GT);
341+
FAIL_IF(urilend->raw_buffer);
360342

361-
urilend = DetectUrilenParse(">10, norm ");
362-
if (urilend != NULL) {
363-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_GT &&
364-
!urilend->raw_buffer)
365-
ret = 1;
366-
367-
DetectUrilenFree(NULL, urilend);
368-
}
369-
return ret;
343+
DetectUrilenFree(NULL, urilend);
344+
PASS;
370345
}
371346

372347
/** \test Test the Urilen keyword setup */
373348
static int DetectUrilenParseTest08(void)
374349
{
375-
int ret = 0;
376-
DetectUrilenData *urilend = NULL;
377-
378-
urilend = DetectUrilenParse("<10, norm ");
379-
if (urilend != NULL) {
380-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_LT &&
381-
!urilend->raw_buffer)
382-
ret = 1;
350+
DetectUrilenData *urilend = DetectUrilenParse("<10, norm ");
351+
FAIL_IF_NULL(urilend);
352+
FAIL_IF(urilend->du16.arg1 != 10);
353+
FAIL_IF(urilend->du16.mode != DETECT_UINT_LT);
354+
FAIL_IF(urilend->raw_buffer);
383355

384-
DetectUrilenFree(NULL, urilend);
385-
}
386-
return ret;
356+
DetectUrilenFree(NULL, urilend);
357+
PASS;
387358
}
388359

389360
/** \test Test the Urilen keyword setup */
390361
static int DetectUrilenParseTest09(void)
391362
{
392-
int ret = 0;
393-
DetectUrilenData *urilend = NULL;
363+
DetectUrilenData *urilend = DetectUrilenParse(">10, raw ");
364+
FAIL_IF_NULL(urilend);
365+
FAIL_IF(urilend->du16.arg1 != 10);
366+
FAIL_IF(urilend->du16.mode != DETECT_UINT_GT);
367+
FAIL_IF(!urilend->raw_buffer);
394368

395-
urilend = DetectUrilenParse(">10, raw ");
396-
if (urilend != NULL) {
397-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_GT && urilend->raw_buffer)
398-
ret = 1;
399-
400-
DetectUrilenFree(NULL, urilend);
401-
}
402-
return ret;
369+
DetectUrilenFree(NULL, urilend);
370+
PASS;
403371
}
404372

405373
/** \test Test the Urilen keyword setup */
406374
static int DetectUrilenParseTest10(void)
407375
{
408-
int ret = 0;
409-
DetectUrilenData *urilend = NULL;
410-
411-
urilend = DetectUrilenParse("<10, raw ");
412-
if (urilend != NULL) {
413-
if (urilend->du16.arg1 == 10 && urilend->du16.mode == DETECT_UINT_LT && urilend->raw_buffer)
414-
ret = 1;
376+
DetectUrilenData *urilend = DetectUrilenParse("<10, raw ");
377+
FAIL_IF_NULL(urilend);
378+
FAIL_IF(urilend->du16.arg1 != 10);
379+
FAIL_IF(urilend->du16.mode != DETECT_UINT_LT);
380+
FAIL_IF(!urilend->raw_buffer);
415381

416-
DetectUrilenFree(NULL, urilend);
417-
}
418-
return ret;
382+
DetectUrilenFree(NULL, urilend);
383+
PASS;
419384
}
420385

421386
/**
@@ -469,34 +434,20 @@ static int DetectUrilenInitTest(DetectEngineCtx **de_ctx, Signature **sig,
469434

470435
static int DetectUrilenSetpTest01(void)
471436
{
472-
473437
DetectUrilenData *urilend = NULL;
474-
uint8_t res = 0;
475438
Signature *sig = NULL;
476439
DetectEngineCtx *de_ctx = NULL;
477440

478-
res = DetectUrilenInitTest(&de_ctx, &sig, &urilend, "1 <> 2 ");
479-
if (res == 0) {
480-
goto end;
481-
}
482-
483-
if(urilend == NULL)
484-
goto cleanup;
485-
486-
if (urilend != NULL) {
487-
if (urilend->du16.arg1 == 1 && urilend->du16.arg2 == 2 &&
488-
urilend->du16.mode == DETECT_UINT_RA)
489-
res = 1;
490-
}
441+
uint8_t res = DetectUrilenInitTest(&de_ctx, &sig, &urilend, "1 <> 3");
442+
FAIL_IF(res == 0);
443+
FAIL_IF_NULL(urilend);
444+
FAIL_IF_NOT(urilend->du16.arg1 == 1);
445+
FAIL_IF_NOT(urilend->du16.arg2 == 3);
446+
FAIL_IF_NOT(urilend->du16.mode == DETECT_UINT_RA);
491447

492-
cleanup:
493-
if (urilend)
494-
DetectUrilenFree(NULL, urilend);
495-
SigGroupCleanup(de_ctx);
496-
SigCleanSignatures(de_ctx);
448+
DetectUrilenFree(NULL, urilend);
497449
DetectEngineCtxFree(de_ctx);
498-
end:
499-
return res;
450+
PASS;
500451
}
501452

502453
/** \test Check a signature with given urilen */
@@ -588,4 +539,4 @@ void DetectUrilenRegisterTests(void)
588539
UtRegisterTest("DetectUrilenSetpTest01", DetectUrilenSetpTest01);
589540
UtRegisterTest("DetectUrilenSigTest01", DetectUrilenSigTest01);
590541
}
591-
#endif /* UNITTESTS */
542+
#endif /* UNITTESTS */

0 commit comments

Comments
 (0)