3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/catch2/internal/catch_test_case_tracker.cpp
View File

@ -186,7 +186,7 @@ namespace TestCaseTracking {
bool complete = true; bool complete = true;
if (m_filters.empty() 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()) { || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
complete = TrackerBase::isComplete(); complete = TrackerBase::isComplete();
} }
@ -223,21 +223,21 @@ namespace TestCaseTracking {
void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) { void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
if( !filters.empty() ) { if( !filters.empty() ) {
m_filters.reserve( m_filters.size() + filters.size() + 2 ); m_filters.reserve( m_filters.size() + filters.size() + 2 );
m_filters.emplace_back(""); // Root - should never be consulted m_filters.emplace_back(StringRef{}); // Root - should never be consulted
m_filters.emplace_back(""); // Test Case - not a section filter m_filters.emplace_back(StringRef{}); // Test Case - not a section filter
m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); 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 ) if( filters.size() > 1 )
m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() ); 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; return m_filters;
} }
std::string const& SectionTracker::trimmedName() const { StringRef SectionTracker::trimmedName() const {
return m_trimmed_name; return m_trimmed_name;
} }

9
src/catch2/internal/catch_test_case_tracker.hpp
View File

@ -10,6 +10,7 @@
#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_source_line_info.hpp>
#include <catch2/internal/catch_unique_ptr.hpp> #include <catch2/internal/catch_unique_ptr.hpp>
#include <catch2/internal/catch_stringref.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
@ -164,7 +165,7 @@ namespace TestCaseTracking {
}; };
class SectionTracker : public TrackerBase { class SectionTracker : public TrackerBase {
std::vector<std::string> m_filters; std::vector<StringRef> m_filters;
std::string m_trimmed_name; std::string m_trimmed_name;
public: public:
SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ); SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
@ -178,11 +179,11 @@ namespace TestCaseTracking {
void tryOpen(); void tryOpen();
void addInitialFilters( std::vector<std::string> const& filters ); void addInitialFilters( std::vector<std::string> const& filters );
void addNextFilters( std::vector<std::string> const& filters ); void addNextFilters( std::vector<StringRef> const& filters );
//! Returns filters active in this tracker //! Returns filters active in this tracker
std::vector<std::string> const& getFilters() const; std::vector<StringRef> const& getFilters() const;
//! Returns whitespace-trimmed name of the tracked section //! Returns whitespace-trimmed name of the tracked section
std::string const& trimmedName() const; StringRef trimmedName() const;
}; };
} // namespace TestCaseTracking } // namespace TestCaseTracking