github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

regression: better format errors, making easy to read the output

Browse Source
This commit is contained in:
Felipe Zimmerle 2015-07-22 15:26:08 -03:00
parent 3f883df763
commit 5b3fd479fc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/regression/regression.cc
View File

@ -71,13 +71,26 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
r.status = 200; r.status = 200;
(*count)++; (*count)++;
size_t offset = t->filename.find_last_of("/\\");
std::string filename("");
if (offset != std::string::npos) {
filename = std::string(t->filename, offset + 1,
t->filename.length() - offset - 1);
} else {
filename = t->filename;
}
std::cout << std::setw(3) << std::right <<
std::to_string(*count) << " ";
std::cout << std::setw(50) << std::left << filename;
std::cout << std::setw(60) << std::left << t->name;
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)");
modsec_rules = new ModSecurity::Rules(debug_log); modsec_rules = new ModSecurity::Rules(debug_log);
if (modsec_rules->load(t->rules.c_str()) == false) { if (modsec_rules->load(t->rules.c_str()) == false) {
std::cerr << "Problems parsing the rules, aborting!" << std::endl; std::cerr << "parse failed." << std::endl;
return; return;
} }
modsec_assay = new ModSecurity::Assay(modsec, modsec_rules); modsec_assay = new ModSecurity::Assay(modsec, modsec_rules);
@ -146,19 +159,6 @@ end:
CustomDebugLog *d = reinterpret_cast<CustomDebugLog *> CustomDebugLog *d = reinterpret_cast<CustomDebugLog *>
(modsec_rules->debug_log); (modsec_rules->debug_log);
size_t offset = t->filename.find_last_of("/\\");
std::string filename("");
if (offset != std::string::npos) {
filename = std::string(t->filename, offset + 1,
t->filename.length() - offset - 1);
} else {
filename = t->filename;
}
std::cout << std::setw(3) << std::right <<
std::to_string(*count) << " ";
std::cout << std::setw(50) << std::left << filename;
std::cout << std::setw(60) << std::left << t->name;
if (!d->contains(t->debug_log)) { if (!d->contains(t->debug_log)) {
std::cout << "Debug log was not matching the expected results."; std::cout << "Debug log was not matching the expected results.";
std::cout << std::endl; std::cout << std::endl;