3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reseeds rng before each test case and provides access to seed through Catch::rngSeed() function

This commit is contained in:
Phil Nash 2015-07-02 23:02:35 +01:00
parent b971fe785b
commit d87e551efa
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_runner.hpp
View File

@ -198,7 +198,7 @@ namespace Catch {
if( m_configData.filenamesAsTags )
applyFilenamesAsTags();
std::srand( m_configData.rngSeed );
seedRng( *m_config );
Runner runner( m_config );

5
include/internal/catch_common.h
View File

@ -22,6 +22,8 @@
#include "catch_compiler_capabilities.h"
namespace Catch {
struct IConfig;
class NonCopyable {
#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
@ -109,6 +111,9 @@ namespace Catch {
void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo );
void seedRng( IConfig const& config );
unsigned int rngSeed();
// Use this in variadic streaming macros to allow
// >> +StreamEndStop
// as well as

8
include/internal/catch_common.hpp
View File

@ -82,6 +82,14 @@ namespace Catch {
return line < other.line || ( line == other.line && file < other.file );
}
void seedRng( IConfig const& config ) {
if( config.rngSeed() != 0 )
std::srand( config.rngSeed() );
}
unsigned int rngSeed() {
return getCurrentContext().getConfig()->rngSeed();
}
std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
#ifndef __GNUG__
os << info.file << "(" << info.line << ")";

2
include/internal/catch_runner_impl.hpp
View File

@ -259,6 +259,8 @@ namespace Catch {
m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
TestCaseTracker::Guard guard( *m_testCaseTracker );
seedRng( *m_config );
Timer timer;
timer.start();
if( m_reporter->getPreferences().shouldRedirectStdOut ) {

2
include/internal/catch_test_case_registry_impl.hpp
View File

@ -90,6 +90,8 @@ namespace Catch {
break;
case RunTests::InRandomOrder:
{
seedRng( config );
RandomNumberGenerator rng;
std::random_shuffle( matchingTestCases.begin(), matchingTestCases.end(), rng );
}