3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-29 16:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move extractClassName to the single calling TU and make it static

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-06-18 23:36:08 +02:00
parent 70f5392210
commit 28a33497be
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/catch2/internal/catch_test_case_registry_impl.cpp
View File

@ -12,7 +12,6 @@
#include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
#include <catch2/internal/catch_random_number_generator.hpp> #include <catch2/internal/catch_random_number_generator.hpp>
#include <catch2/internal/catch_run_context.hpp> #include <catch2/internal/catch_run_context.hpp>
#include <catch2/internal/catch_string_manip.hpp>
#include <catch2/catch_test_case_info.hpp> #include <catch2/catch_test_case_info.hpp>
#include <catch2/catch_test_spec.hpp> #include <catch2/catch_test_spec.hpp>
@ -149,17 +148,4 @@ namespace {
m_testAsFunction(); m_testAsFunction();
} }
std::string extractClassName( StringRef classOrQualifiedMethodName ) {
std::string className(classOrQualifiedMethodName);
if( startsWith( className, '&' ) )
{
std::size_t lastColons = className.rfind( "::" );
std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
if( penultimateColons == std::string::npos )
penultimateColons = 1;
className = className.substr( penultimateColons, lastColons-penultimateColons );
}
return className;
}
} // end namespace Catch } // end namespace Catch

3
src/catch2/internal/catch_test_case_registry_impl.hpp
View File

@ -63,9 +63,6 @@ namespace Catch {
void invoke() const override; void invoke() const override;
}; };
std::string extractClassName( StringRef classOrQualifiedMethodName );
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

17
src/catch2/internal/catch_test_registry.cpp
View File

@ -10,9 +10,26 @@
#include <catch2/catch_test_case_info.hpp> #include <catch2/catch_test_case_info.hpp>
#include <catch2/internal/catch_test_case_registry_impl.hpp> #include <catch2/internal/catch_test_case_registry_impl.hpp>
#include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
#include <catch2/internal/catch_string_manip.hpp>
namespace Catch { namespace Catch {
namespace {
std::string extractClassName( StringRef classOrQualifiedMethodName ) {
std::string className( classOrQualifiedMethodName );
if ( startsWith( className, '&' ) ) {
std::size_t lastColons = className.rfind( "::" );
std::size_t penultimateColons =
className.rfind( "::", lastColons - 1 );
if ( penultimateColons == std::string::npos )
penultimateColons = 1;
className = className.substr( penultimateColons,
lastColons - penultimateColons );
}
return className;
}
} // namespace
Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() ) { Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() ) {
return Detail::make_unique<TestInvokerAsFunction>( testAsFunction ); return Detail::make_unique<TestInvokerAsFunction>( testAsFunction );
} }