mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-14 09:49:54 +01:00
f696ab836b
Previously a random test ordering was obtained by applying std::shuffle to the tests in declaration order. This has two problems: - It depends on the declaration order, so the order in which the tests will be run will be platform-specific. - When trying to debug accidental inter-test dependencies, it is helpful to be able to find a minimal subset of tests which exhibits the issue. However, any change to the set of tests being run will completely change the test ordering, making it difficult or impossible to reduce the set of tests being run in any reasonably efficient manner. Therefore, change the randomization approach to resolve both these issues. Generate a random value based on the user-provided RNG seed. Convert every test case to an integer by hashing a combination of that value with the test name. Sort the test cases by this integer. The test names and RNG are platform-independent, so this should be consistent across platforms. Also, removing one test does not change the integer value associated with the remaining tests, so they remain in the same order. To hash, use the FNV-1a hash, except with the basis being our randomly selected value rather than the fixed basis set in the algorithm. Cannot use std::hash, because it is important that the result be platform-independent.
161 lines
6.0 KiB
C++
161 lines
6.0 KiB
C++
/*
|
|
* Created by Martin on 25/07/2017
|
|
*
|
|
* Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
*/
|
|
|
|
#include "catch_test_case_registry_impl.h"
|
|
|
|
#include "catch_context.h"
|
|
#include "catch_enforce.h"
|
|
#include "catch_interfaces_registry_hub.h"
|
|
#include "catch_random_number_generator.h"
|
|
#include "catch_run_context.h"
|
|
#include "catch_string_manip.h"
|
|
#include "catch_test_case_info.h"
|
|
|
|
#include <algorithm>
|
|
#include <iterator>
|
|
#include <random>
|
|
#include <sstream>
|
|
|
|
namespace Catch {
|
|
|
|
struct HashTest {
|
|
explicit HashTest( Catch::SimplePcg32& rng ) {
|
|
basis = rng();
|
|
basis <<= 32;
|
|
basis |= rng();
|
|
}
|
|
|
|
uint64_t basis;
|
|
|
|
uint64_t operator()( TestCase const& t ) const {
|
|
// Modified FNV-1a hash
|
|
static constexpr uint64_t prime = 1099511628211;
|
|
uint64_t hash = basis;
|
|
for( const char c : t.name ) {
|
|
hash ^= c;
|
|
hash *= prime;
|
|
}
|
|
return hash;
|
|
}
|
|
};
|
|
|
|
std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
|
|
switch( config.runOrder() ) {
|
|
case RunTests::InLexicographicalOrder: {
|
|
std::vector<TestCase> sorted = unsortedTestCases;
|
|
std::sort( sorted.begin(), sorted.end() );
|
|
return sorted;
|
|
}
|
|
case RunTests::InRandomOrder: {
|
|
seedRng( config );
|
|
HashTest h( rng() );
|
|
std::vector<std::tuple<uint64_t, std::string, TestCase const*>> indexed_tests;
|
|
indexed_tests.reserve( unsortedTestCases.size() );
|
|
std::transform( unsortedTestCases.begin(), unsortedTestCases.end(),
|
|
std::back_inserter( indexed_tests ),
|
|
[&]( TestCase const& t ) {
|
|
return std::make_tuple( h(t), t.name, &t );
|
|
} );
|
|
std::sort( indexed_tests.begin(), indexed_tests.end() );
|
|
std::vector<TestCase> sorted;
|
|
sorted.reserve( unsortedTestCases.size() );
|
|
std::transform( indexed_tests.begin(), indexed_tests.end(),
|
|
std::back_inserter( sorted ),
|
|
[]( std::tuple<uint64_t, std::string, TestCase const*> const& t ) {
|
|
return *std::get<2>( t );
|
|
} );
|
|
return sorted;
|
|
}
|
|
case RunTests::InDeclarationOrder:
|
|
// already in declaration order
|
|
break;
|
|
}
|
|
return unsortedTestCases;
|
|
}
|
|
|
|
bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
|
|
return !testCase.throws() || config.allowThrows();
|
|
}
|
|
|
|
bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
|
|
return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
|
|
}
|
|
|
|
void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
|
|
std::set<TestCase> seenFunctions;
|
|
for( auto const& function : functions ) {
|
|
auto prev = seenFunctions.insert( function );
|
|
CATCH_ENFORCE( prev.second,
|
|
"error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
|
|
<< "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
|
|
<< "\tRedefined at " << function.getTestCaseInfo().lineInfo );
|
|
}
|
|
}
|
|
|
|
std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
|
|
std::vector<TestCase> filtered;
|
|
filtered.reserve( testCases.size() );
|
|
for (auto const& testCase : testCases) {
|
|
if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
|
|
(testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
|
|
filtered.push_back(testCase);
|
|
}
|
|
}
|
|
return filtered;
|
|
}
|
|
std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
|
|
return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
|
|
}
|
|
|
|
void TestRegistry::registerTest( TestCase const& testCase ) {
|
|
std::string name = testCase.getTestCaseInfo().name;
|
|
if( name.empty() ) {
|
|
ReusableStringStream rss;
|
|
rss << "Anonymous test case " << ++m_unnamedCount;
|
|
return registerTest( testCase.withName( rss.str() ) );
|
|
}
|
|
m_functions.push_back( testCase );
|
|
}
|
|
|
|
std::vector<TestCase> const& TestRegistry::getAllTests() const {
|
|
return m_functions;
|
|
}
|
|
std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
|
|
if( m_sortedFunctions.empty() )
|
|
enforceNoDuplicateTestCases( m_functions );
|
|
|
|
if( m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
|
|
m_sortedFunctions = sortTests( config, m_functions );
|
|
m_currentSortOrder = config.runOrder();
|
|
}
|
|
return m_sortedFunctions;
|
|
}
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
|
|
|
|
void TestInvokerAsFunction::invoke() const {
|
|
m_testAsFunction();
|
|
}
|
|
|
|
std::string extractClassName( StringRef const& 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
|