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

util/action: convert unittests to FAIL/PASS API

Browse Source 
Task #5371
pull/7436/head
Juliana Fajardini 3 years ago committed by Victor Julien
parent 9b9b6aa2ce
commit 43d28f251f
1 changed files with 41 additions and 76 deletions
Show Stats Download Patch File Download Diff File

117
src/util-action.c
Unescape Escape View File

@ -170,7 +170,6 @@ int ActionInitConfig()
*/ */
static int UtilActionTest01(void) static int UtilActionTest01(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -185,13 +184,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_ALERT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -199,7 +195,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -208,7 +204,6 @@ action-order:\n\
*/ */
static int UtilActionTest02(void) static int UtilActionTest02(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -223,13 +218,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_ALERT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -237,7 +229,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -246,7 +238,6 @@ action-order:\n\
*/ */
static int UtilActionTest03(void) static int UtilActionTest03(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -260,13 +251,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_ALERT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -274,7 +262,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -283,7 +271,6 @@ action-order:\n\
*/ */
static int UtilActionTest04(void) static int UtilActionTest04(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -294,13 +281,10 @@ action-order:\n";
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_ALERT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -308,7 +292,7 @@ action-order:\n";
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -318,7 +302,6 @@ action-order:\n";
*/ */
static int UtilActionTest05(void) static int UtilActionTest05(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -334,13 +317,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_ALERT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -348,7 +328,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -356,7 +336,6 @@ action-order:\n\
*/ */
static int UtilActionTest06(void) static int UtilActionTest06(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -371,13 +350,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_ALERT || FAIL_IF_NOT(action_order_sigs[0] == ACTION_ALERT);
action_order_sigs[1] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
action_order_sigs[2] != ACTION_REJECT || FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
action_order_sigs[3] != ACTION_PASS) FAIL_IF_NOT(action_order_sigs[3] == ACTION_PASS);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -385,7 +361,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -393,7 +369,6 @@ action-order:\n\
*/ */
static int UtilActionTest07(void) static int UtilActionTest07(void)
{ {
int res = 1;
char config[] = "\ char config[] = "\
%YAML 1.1\n\ %YAML 1.1\n\
---\n\ ---\n\
@ -408,13 +383,10 @@ action-order:\n\
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
ActionInitConfig(); ActionInitConfig();
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
action_order_sigs[1] != ACTION_ALERT || FAIL_IF_NOT(action_order_sigs[1] == ACTION_ALERT);
action_order_sigs[2] != ACTION_DROP || FAIL_IF_NOT(action_order_sigs[2] == ACTION_DROP);
action_order_sigs[3] != ACTION_REJECT) FAIL_IF_NOT(action_order_sigs[3] == ACTION_REJECT);
{
res = 0;
}
ConfRestoreContextBackup(); ConfRestoreContextBackup();
/* Restore default values */ /* Restore default values */
@ -422,7 +394,7 @@ action-order:\n\
action_order_sigs[1] = ACTION_DROP; action_order_sigs[1] = ACTION_DROP;
action_order_sigs[2] = ACTION_REJECT; action_order_sigs[2] = ACTION_REJECT;
action_order_sigs[3] = ACTION_ALERT; action_order_sigs[3] = ACTION_ALERT;
return res; PASS;
} }
/** /**
@ -431,7 +403,6 @@ action-order:\n\
*/ */
static int UtilActionTest08(void) static int UtilActionTest08(void)
{ {
int res = 1;
char config[] = "%YAML 1.1\n" char config[] = "%YAML 1.1\n"
"---\n"; "---\n";
@ -439,20 +410,14 @@ static int UtilActionTest08(void)
ConfInit(); ConfInit();
ConfYamlLoadString(config, strlen(config)); ConfYamlLoadString(config, strlen(config));
if (ActionInitConfig() != 0) { FAIL_IF_NOT(ActionInitConfig() == 0);
res = 0; FAIL_IF_NOT(action_order_sigs[0] == ACTION_PASS);
goto done; FAIL_IF_NOT(action_order_sigs[1] == ACTION_DROP);
} FAIL_IF_NOT(action_order_sigs[2] == ACTION_REJECT);
if (action_order_sigs[0] != ACTION_PASS || FAIL_IF_NOT(action_order_sigs[3] == ACTION_ALERT);
action_order_sigs[1] != ACTION_DROP ||
action_order_sigs[2] != ACTION_REJECT ||
action_order_sigs[3] != ACTION_ALERT) {
res = 0;
}
done:
ConfRestoreContextBackup(); ConfRestoreContextBackup();
return res; PASS;
} }
/* Register unittests */ /* Register unittests */

Write Preview
Loading…
Cancel
Save