Commit d03d23a6 authored by Hossein Ghahramanzadeh's avatar Hossein Ghahramanzadeh
Browse files

Reimplement MatchesFilter with new interfaces.

parent 3fc1ab66
...@@ -390,6 +390,10 @@ class GTEST_API_ UnitTestOptions { ...@@ -390,6 +390,10 @@ class GTEST_API_ UnitTestOptions {
// This function is useful as an __except condition. // This function is useful as an __except condition.
static int GTestShouldProcessSEH(DWORD exception_code); static int GTestShouldProcessSEH(DWORD exception_code);
#endif // GTEST_OS_WINDOWS #endif // GTEST_OS_WINDOWS
// Returns true if "name" matches the ':' separated list of glob-style
// filters in "filter".
static bool MatchesFilter(const std::string& name, const char* filter);
}; };
// Returns the current application's name, removing directory path if that // Returns the current application's name, removing directory path if that
......
...@@ -797,6 +797,11 @@ class PositiveAndNegativeUnitTestFilter { ...@@ -797,6 +797,11 @@ class PositiveAndNegativeUnitTestFilter {
}; };
} // namespace } // namespace
bool UnitTestOptions::MatchesFilter(const std::string& name_str,
const char* filter) {
return UnitTestFilter{filter}.MatchesName(name_str);
}
// Returns true if and only if the user-specified filter matches the test // Returns true if and only if the user-specified filter matches the test
// suite name and the test name. // suite name and the test name.
bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name, bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment