diff options
| author | Martin Hořeňovský | 2019-09-09 11:30:45 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-09-09 14:28:11 +0200 |
| commit | af8b2538a62db34b3cec10ceb74e3d29bd06e37f (patch) | |
| tree | 32069c3bf1662b5d50a78829584b3352458f238c /include/internal/catch_test_case_tracker.cpp | |
| parent | a156440b19c1103419b6e4d3ebbfe3c7ddb948dc (diff) | |
| download | catch3-af8b2538a62db34b3cec10ceb74e3d29bd06e37f.tar.gz | |
Ignore leading/trailing whitespace in test/section specs
The leading/trailing whitespace is problematic because of e.g.
`WHEN` macro having preceeding whitespace for alignment, and it is
generally messy.
Credits to Phil who did lot of the original work.
Closes #1708
Diffstat (limited to 'include/internal/catch_test_case_tracker.cpp')
| -rw-r--r-- | include/internal/catch_test_case_tracker.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/internal/catch_test_case_tracker.cpp b/include/internal/catch_test_case_tracker.cpp index 9e75590c..77bd65cb 100644 --- a/include/internal/catch_test_case_tracker.cpp +++ b/include/internal/catch_test_case_tracker.cpp @@ -8,6 +8,7 @@ #include "catch_test_case_tracker.h" #include "catch_enforce.h" +#include "catch_string_manip.h" #include <algorithm> #include <cassert> @@ -174,7 +175,8 @@ namespace TestCaseTracking { } SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : TrackerBase( nameAndLocation, ctx, parent ) + : TrackerBase( nameAndLocation, ctx, parent ), + m_trimmed_name(trim(nameAndLocation.name)) { if( parent ) { while( !parent->isSectionTracker() ) @@ -188,12 +190,11 @@ namespace TestCaseTracking { bool SectionTracker::isComplete() const { bool complete = true; - if ((m_filters.empty() || m_filters[0] == "") || - std::find(m_filters.begin(), m_filters.end(), - m_nameAndLocation.name) != m_filters.end()) + if ((m_filters.empty() || m_filters[0] == "") + || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) { complete = TrackerBase::isComplete(); + } return complete; - } bool SectionTracker::isSectionTracker() const { return true; } @@ -217,12 +218,13 @@ namespace TestCaseTracking { } void SectionTracker::tryOpen() { - if( !isComplete() && (m_filters.empty() || m_filters[0].empty() || m_filters[0] == m_nameAndLocation.name ) ) + if( !isComplete() ) open(); } void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) { if( !filters.empty() ) { + m_filters.reserve( m_filters.size() + filters.size() + 2 ); m_filters.push_back(""); // Root - should never be consulted m_filters.push_back(""); // Test Case - not a section filter m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); @@ -230,7 +232,7 @@ namespace TestCaseTracking { } void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) { if( filters.size() > 1 ) - m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() ); + m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() ); } } // namespace TestCaseTracking |