eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 22:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made everything used in test case registration noexcept

Browse source 
- this prevents warnings about startup-time exceptions
This commit is contained in:
Phil Nash 2017-07-13 08:25:47 +01:00
parent 989222eceb
commit e01ed48a70
8 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/internal/catch_test_case_registry_impl.hpp
View file

@ -46,10 +46,8 @@ namespace Catch {
std::sort( sorted.begin(), sorted.end() );
break;
case RunTests::InRandomOrder:
{
seedRng( config );
RandomNumberGenerator::shuffle( sorted );
}
seedRng( config );
RandomNumberGenerator::shuffle( sorted );
break;
case RunTests::InDeclarationOrder:
// already in declaration order
@ -128,14 +126,14 @@ namespace Catch {
class TestInvokerAsFunction : public ITestInvoker {
void(*m_testAsFunction)();
public:
TestInvokerAsFunction( void(*testAsFunction)() ) : m_testAsFunction( testAsFunction ) {}
TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
void invoke() const override {
m_testAsFunction();
}
};
auto makeTestInvoker( void(*testAsFunction)() ) -> ITestInvoker* {
return new TestInvokerAsFunction( testAsFunction );
auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
}
@ -154,7 +152,7 @@ namespace Catch {
///////////////////////////////////////////////////////////////////////////
AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef classOrMethod, NameAndTags const& nameAndTags )
AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef classOrMethod, NameAndTags const& nameAndTags ) noexcept
{
try {
getMutableRegistryHub()