Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-12-04 21:37:19 +0100
committerMartin Hořeňovský2020-12-04 21:37:24 +0100
commit6350851f9af96a1c35da92b18ca7cb3d90fa67c9 (patch)
tree783930500698885dbe66e96d8012a6d3fd577f86 /src
parent21c97f2fad9ab9c979b7d1065253bbb4b172b6dc (diff)
downloadcatch3-6350851f9af96a1c35da92b18ca7cb3d90fa67c9.tar.gz
Return plain ptr from ITracker::findChild instead of shared_ptr
This is part of wider rework of trackers to avoid `std::shared_ptr` everywhere. Related to #2088
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_run_context.cpp24
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp20
-rw-r--r--src/catch2/internal/catch_test_case_tracker.hpp2
3 files changed, 26 insertions, 20 deletions
diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index 777c7075..79022dd4 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -34,7 +34,7 @@ namespace Catch {
~GeneratorTracker();
static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
- std::shared_ptr<GeneratorTracker> tracker;
+ GeneratorTracker* tracker;
ITracker& currentTracker = ctx.currentTracker();
// Under specific circumstances, the generator we want
@@ -48,18 +48,22 @@ namespace Catch {
// }
//
// without it, the code above creates 5 nested generators.
- if (currentTracker.nameAndLocation() == nameAndLocation) {
- auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
- assert(thisTracker);
- assert(thisTracker->isGeneratorTracker());
- tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
- } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+ if ( currentTracker.nameAndLocation() == nameAndLocation ) {
+ auto thisTracker =
+ currentTracker.parent().findChild( nameAndLocation );
+ assert( thisTracker );
+ assert( thisTracker->isGeneratorTracker() );
+ tracker = static_cast<GeneratorTracker*>( thisTracker );
+ } else if ( ITracker* childTracker =
+ currentTracker.findChild( nameAndLocation ) ) {
assert( childTracker );
assert( childTracker->isGeneratorTracker() );
- tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+ tracker = static_cast<GeneratorTracker*>( childTracker );
} else {
- tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
- currentTracker.addChild( tracker );
+ auto newTracker = std::make_shared<GeneratorTracker>(
+ nameAndLocation, ctx, &currentTracker );
+ tracker = newTracker.get();
+ currentTracker.addChild( std::move(newTracker) );
}
if( !tracker->isComplete() ) {
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index 3891614d..b405ce86 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -34,7 +34,7 @@ namespace TestCaseTracking {
m_children.push_back( child );
}
- ITrackerPtr ITracker::findChild( NameAndLocation const& nameAndLocation ) {
+ ITracker* ITracker::findChild( NameAndLocation const& nameAndLocation ) {
auto it = std::find_if(
m_children.begin(),
m_children.end(),
@@ -43,7 +43,7 @@ namespace TestCaseTracking {
nameAndLocation.location &&
tracker->nameAndLocation().name == nameAndLocation.name;
} );
- return ( it != m_children.end() ) ? *it : nullptr;
+ return ( it != m_children.end() ) ? it->get() : nullptr;
}
@@ -195,17 +195,19 @@ namespace TestCaseTracking {
bool SectionTracker::isSectionTracker() const { return true; }
SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
- std::shared_ptr<SectionTracker> section;
+ SectionTracker* section;
ITracker& currentTracker = ctx.currentTracker();
- if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+ if ( ITracker* childTracker =
+ currentTracker.findChild( nameAndLocation ) ) {
assert( childTracker );
assert( childTracker->isSectionTracker() );
- section = std::static_pointer_cast<SectionTracker>( childTracker );
- }
- else {
- section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
- currentTracker.addChild( section );
+ section = static_cast<SectionTracker*>( childTracker );
+ } else {
+ auto newSection = std::make_shared<SectionTracker>(
+ nameAndLocation, ctx, &currentTracker );
+ section = newSection.get();
+ currentTracker.addChild( std::move( newSection ) );
}
if( !ctx.completedCycle() )
section->tryOpen();
diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp
index 2c51346a..b1c5a8b4 100644
--- a/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/src/catch2/internal/catch_test_case_tracker.hpp
@@ -75,7 +75,7 @@ namespace TestCaseTracking {
*
* Returns nullptr if not found.
*/
- ITrackerPtr findChild( NameAndLocation const& nameAndLocation );
+ ITracker* findChild( NameAndLocation const& nameAndLocation );
//! Have any children been added?
bool hasChildren() const {
return !m_children.empty();