github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for disabled test cases.

Browse Source 
This commit adds support for skipping test cases that have enabled=0 in
their JSON body.

A separate counter is kept and reported in the final non-automake
output, detailing disabled as a separate field.

Ref: #1513
This commit is contained in:
Lasse Karstensen
2017-08-01 12:08:27 +02:00
committed by Felipe Zimmerle
parent ab14b7c083
commit d66f0c7e0d
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/regression/regression.cc
View File

@@ -94,10 +94,6 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
ModSecurityTestResults<RegressionTestResult> *res, int *count) { ModSecurityTestResults<RegressionTestResult> *res, int *count) {
for (RegressionTest *t : *tests) { for (RegressionTest *t : *tests) {
if (t->enabled == 0) {
continue;
}
CustomDebugLog *debug_log = new CustomDebugLog(); CustomDebugLog *debug_log = new CustomDebugLog();
modsecurity::ModSecurity *modsec = NULL; modsecurity::ModSecurity *modsec = NULL;
modsecurity::Rules *modsec_rules = NULL; modsecurity::Rules *modsec_rules = NULL;
@@ -105,6 +101,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
ModSecurityTestResults<RegressionTest> r; ModSecurityTestResults<RegressionTest> r;
std::stringstream serverLog; std::stringstream serverLog;
RegressionTestResult *testRes = new RegressionTestResult(); RegressionTestResult *testRes = new RegressionTestResult();
testRes->test = t; testRes->test = t;
r.status = 200; r.status = 200;
(*count)++; (*count)++;
@@ -125,6 +122,19 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
std::cout << std::setw(70) << std::left << t->name; std::cout << std::setw(70) << std::left << t->name;
} }
if (t->enabled == 0) {
if (test->m_automake_output) {
std::cout << ":test-result: disabled" << filename \
<< ":" << t->name << std::endl;
} else {
std::cout << KCYN << "disabled" << RESET << std::endl;
}
res->push_back(testRes);
testRes->disabled = true;
testRes->reason << "JSON disabled";
continue;
}
modsec = new modsecurity::ModSecurity(); modsec = new modsecurity::ModSecurity();
modsec->setConnectorInformation("ModSecurity-regression v0.0.1-alpha" \ modsec->setConnectorInformation("ModSecurity-regression v0.0.1-alpha" \
" (ModSecurity regression test utility)"); " (ModSecurity regression test utility)");
@@ -473,17 +483,22 @@ int main(int argc, char **argv) {
int passed = 0; int passed = 0;
int failed = 0; int failed = 0;
int disabled = 0;
int skipped = 0; int skipped = 0;
for (RegressionTestResult *r : res) { for (RegressionTestResult *r : res) {
if (r->skipped == true) { if (r->skipped == true) {
skipped++; skipped++;
} }
if (r->passed == true && r->skipped == false) { if (r->disabled == true) {
disabled++;
}
if (r->passed == true) {
passed++; passed++;
} else if (r->skipped == false) { }
if (test.m_automake_output) {
// m_automake_output if (!r->passed && !r->skipped && !r->disabled) {
} else { if (!test.m_automake_output) {
std::cout << KRED << "Test failed." << RESET << KWHT \ std::cout << KRED << "Test failed." << RESET << KWHT \
<< " From: " \ << " From: " \
<< RESET << r->test->filename << "." << std::endl; << RESET << r->test->filename << "." << std::endl;
@@ -502,18 +517,16 @@ int main(int argc, char **argv) {
std::cout << "Ran a total of: " << std::to_string(failed + passed) \ std::cout << "Ran a total of: " << std::to_string(failed + passed) \
<< " regression tests - "; << " regression tests - ";
if (failed == 0) { if (failed == 0) {
std::cout << KGRN << "All tests passed." << RESET; std::cout << KGRN << "All tests passed. " << RESET;
} else { } else {
std::cout << KRED << failed << " failed." << RESET; std::cout << KRED << failed << " failed. " << RESET;
} }
if (skipped > 0) { std::cout << KCYN << std::to_string(skipped) << " ";
std::cout << KCYN << " " << std::to_string(skipped) << " "; std::cout << "skipped test(s). " << std::to_string(disabled) << " ";
std::cout << "skipped tests." << RESET << std::endl; std::cout << "disabled test(s)." << RESET << std::endl;
} else {
std::cout << std::endl;
}
} }
for (std::pair<std::string, std::vector<RegressionTest *> *> a : test) { for (std::pair<std::string, std::vector<RegressionTest *> *> a : test) {
std::vector<RegressionTest *> *vec = a.second; std::vector<RegressionTest *> *vec = a.second;
for (int i = 0; i < vec->size(); i++) { for (int i = 0; i < vec->size(); i++) {

2
test/regression/regression_test.h
View File

@@ -83,10 +83,12 @@ class RegressionTestResult {
RegressionTestResult() : RegressionTestResult() :
passed(false), passed(false),
skipped(false), skipped(false),
disabled(false),
test(NULL) { } test(NULL) { }
bool passed; bool passed;
bool skipped; bool skipped;
bool disabled;
RegressionTest *test; RegressionTest *test;
std::stringstream reason; std::stringstream reason;
}; };