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

Moves static methods from class String to the namespace string

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-11-04 15:58:05 -03:00
parent 62a0cb468b
commit 2244e874e2
31 changed files with 151 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/unit.cc
View File

@@ -31,7 +31,6 @@
#include "src/utils/string.h"
using modsecurity::utils::String;
using modsecurity_test::UnitTest;
using modsecurity_test::ModSecurityTest;
using modsecurity_test::ModSecurityTestResults;
@@ -91,7 +90,8 @@ void perform_unit_test(ModSecurityTest<UnitTest> *test, UnitTest *t,
if (test->m_automake_output) {
std::cout << t->name << " "
<< String::toHexIfNeeded(t->input) << std::endl;
<< modsecurity::utils::string::toHexIfNeeded(t->input)
<< std::endl;
}
}

9
test/unit/unit_test.cc
View File

@@ -27,9 +27,6 @@
#include "src/utils/string.h"
using modsecurity::utils::String;
namespace modsecurity_test {
@@ -112,9 +109,11 @@ std::string UnitTest::print() {
i << this->obtained << "\"" << std::endl;
}
if (this->output != this->obtainedOutput) {
i << "Expecting: \"" << String::toHexIfNeeded(this->output);
i << "Expecting: \"";
i << modsecurity::utils::string::toHexIfNeeded(this->output);
i << "\" - returned: \"";
i << String::toHexIfNeeded(this->obtainedOutput) << "\"";
i << modsecurity::utils::string::toHexIfNeeded(this->obtainedOutput);
i << "\"";
i << std::endl;
}