feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Use StringRefs in SectionTracker's filter bookkeeping

Browse Source
This commit is contained in:
Martin Hořeňovský
2021-09-09 11:04:34 +02:00
parent 317db82396
commit 12bca890b7
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/catch2/internal/catch_test_case_tracker.cpp
+6 -6
View File
@@ -186,7 +186,7 @@ namespace TestCaseTracking {
bool complete = true;
if (m_filters.empty()
|| m_filters[0] == ""
|| m_filters[0].empty()
|| std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
complete = TrackerBase::isComplete();
}
@@ -223,21 +223,21 @@ namespace TestCaseTracking {
void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
if( !filters.empty() ) {
m_filters.reserve( m_filters.size() + filters.size() + 2 );
m_filters.emplace_back(""); // Root - should never be consulted
m_filters.emplace_back(""); // Test Case - not a section filter
m_filters.emplace_back(StringRef{}); // Root - should never be consulted
m_filters.emplace_back(StringRef{}); // Test Case - not a section filter
m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
}
}
void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
void SectionTracker::addNextFilters( std::vector<StringRef> const& filters ) {
if( filters.size() > 1 )
m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
}
std::vector<std::string> const& SectionTracker::getFilters() const {
std::vector<StringRef> const& SectionTracker::getFilters() const {
return m_filters;
}
std::string const& SectionTracker::trimmedName() const {
StringRef SectionTracker::trimmedName() const {
return m_trimmed_name;
}