3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 00:46:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply requested changes to preserve old behavior.

Browse Source
This commit is contained in:
Hossein Ghahramanzadeh 2021-12-17 02:45:56 +01:00
parent d03d23a6e5
commit 4adbc9c9b2
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
googletest/src/gtest.cc
View File

@ -50,6 +50,7 @@
#include <limits> #include <limits>
#include <list> #include <list>
#include <map> #include <map>
#include <numeric>
#include <ostream> // NOLINT #include <ostream> // NOLINT
#include <sstream> #include <sstream>
#include <vector> #include <vector>
@ -724,26 +725,26 @@ static bool PatternMatchesString(const std::string& name_str,
} }
namespace { namespace {
class UnitTestFilter { class UnitTestFilter {
public: public:
UnitTestFilter() = default; UnitTestFilter() = default;
// Constructs a filter form a string of patterns separated by `:`. // Constructs a filter form a string of patterns separated by `:`.
explicit UnitTestFilter(const std::string& filter) { explicit UnitTestFilter(const std::string& filter) {
if (filter.empty()) return; // By design "" filter matches "" string.
SplitString(filter, ':', &patterns_); SplitString(filter, ':', &patterns_);
} }
// Returns true if and only if name matches at least one of the patterns in // Returns true if and only if name matches at least one of the patterns in
// the filter. // the filter.
bool MatchesName(const std::string& name) const { bool MatchesName(const std::string& name) const {
const auto pattern_matches_name = [&name](const std::string& pattern) {
return PatternMatchesString(name, pattern.c_str(),
pattern.c_str() + pattern.size());
};
return std::any_of(patterns_.begin(), patterns_.end(), return std::any_of(patterns_.begin(), patterns_.end(),
pattern_matches_name); [&name](const std::string& pattern) {
return PatternMatchesString(
name, pattern.c_str(),
pattern.c_str() + pattern.size());
});
} }
private: private:
@ -766,10 +767,18 @@ class PositiveAndNegativeUnitTestFilter {
if (positive_and_negative_filters.size() > 1) { if (positive_and_negative_filters.size() > 1) {
positive_filter_ = UnitTestFilter{ positive_filter_ = UnitTestFilter{
positive_filter.size() ? positive_filter : kUniversalFilter}; positive_filter.size() ? positive_filter : kUniversalFilter};
negative_filter_ = UnitTestFilter{positive_and_negative_filters.back()};
// TODO: Fail on multiple '-' characters
// For the moment to preserve old behavior we concatenate the rest of the
// string parts with `-` as separator to generate the negative filter.
negative_filter_ = UnitTestFilter{std::accumulate(
positive_and_negative_filters.begin() + 2,
positive_and_negative_filters.end(), positive_and_negative_filters[1],
[](const auto& lhs, const auto& rhs) { return lhs + '-' + rhs; })};
} else { } else {
// In case positive filter is empty // In case we don't have a negative filter and positive filter is ""
// we do not use kUniversalFilter by design // we do not use kUniversalFilter by design as opposed to when we have a
// negative filter.
positive_filter_ = UnitTestFilter{positive_filter}; positive_filter_ = UnitTestFilter{positive_filter};
} }
} }
@ -779,9 +788,7 @@ class PositiveAndNegativeUnitTestFilter {
// and does not match the negative filter. // and does not match the negative filter.
bool MatchesTest(const std::string& test_suite_name, bool MatchesTest(const std::string& test_suite_name,
const std::string& test_name) const { const std::string& test_name) const {
const std::string& full_name = test_suite_name + "." + test_name.c_str(); return MatchesName(test_suite_name + "." + test_name);
return MatchesName(full_name);
} }
// Returns true if and only if name matches the positive filter and does not // Returns true if and only if name matches the positive filter and does not