diff options
| author | Daniel Feist | 2022-03-31 16:46:41 +0200 |
|---|---|---|
| committer | GitHub | 2022-03-31 16:46:41 +0200 |
| commit | 78e33ce51f78f0837b36a0e8b6b92c4b2a860178 (patch) | |
| tree | 35f4c8fc248ae1e99e411a1c58ca080c3495dcb5 /src/catch2/internal/catch_test_case_registry_impl.cpp | |
| parent | 1a8a793178d50b74b0f9a0adb3eec937b61039a9 (diff) | |
| download | catch3-78e33ce51f78f0837b36a0e8b6b92c4b2a860178.tar.gz | |
Added TestCaseInfoHasher and tests. (#2394)
Test case hashing includes tags and class name
As the hasher involves more code now, it was split out into its own file
and it got its own set of tests.
Closes #2304
Diffstat (limited to 'src/catch2/internal/catch_test_case_registry_impl.cpp')
| -rw-r--r-- | src/catch2/internal/catch_test_case_registry_impl.cpp | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/catch2/internal/catch_test_case_registry_impl.cpp b/src/catch2/internal/catch_test_case_registry_impl.cpp index 3c1ab54b..6c491a95 100644 --- a/src/catch2/internal/catch_test_case_registry_impl.cpp +++ b/src/catch2/internal/catch_test_case_registry_impl.cpp @@ -16,38 +16,13 @@ #include <catch2/catch_test_case_info.hpp> #include <catch2/catch_test_spec.hpp> #include <catch2/internal/catch_move_and_forward.hpp> +#include <catch2/internal/catch_test_case_info_hasher.hpp> #include <algorithm> #include <set> namespace Catch { -namespace { - struct TestHasher { - using hash_t = uint64_t; - - explicit TestHasher( hash_t hashSuffix ): - m_hashSuffix( hashSuffix ) {} - - uint64_t m_hashSuffix; - - uint32_t operator()( TestCaseInfo const& t ) const { - // FNV-1a hash with multiplication fold. - const hash_t prime = 1099511628211u; - hash_t hash = 14695981039346656037u; - for (const char c : t.name) { - hash ^= c; - hash *= prime; - } - hash ^= m_hashSuffix; - hash *= prime; - const uint32_t low{ static_cast<uint32_t>(hash) }; - const uint32_t high{ static_cast<uint32_t>(hash >> 32) }; - return low * high; - } - }; -} // end anonymous namespace - std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ) { switch (config.runOrder()) { case TestRunOrder::Declared: @@ -66,9 +41,9 @@ namespace { } case TestRunOrder::Randomized: { seedRng(config); - using TestWithHash = std::pair<TestHasher::hash_t, TestCaseHandle>; + using TestWithHash = std::pair<TestCaseInfoHasher::hash_t, TestCaseHandle>; - TestHasher h{ config.rngSeed() }; + TestCaseInfoHasher h{ config.rngSeed() }; std::vector<TestWithHash> indexed_tests; indexed_tests.reserve(unsortedTestCases.size()); |