Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-08-11 15:46:03 +0200
committerMartin Hořeňovský2020-08-11 17:47:00 +0200
commitb0531404e4cdd31d63bebbc21d9a4556922a0626 (patch)
treece272bad4886fae2486ed5e96a8be8cfccd501a6 /src/catch2/internal
parent60cc4c293d4d7d984a0f01397270ce592a397de5 (diff)
downloadcatch3-b0531404e4cdd31d63bebbc21d9a4556922a0626.tar.gz
Turn RunTests into TestRunOrder enum class
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_commandline.cpp6
-rw-r--r--src/catch2/internal/catch_test_case_registry_impl.cpp6
-rw-r--r--src/catch2/internal/catch_test_case_registry_impl.hpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp
index 43428813..546fa256 100644
--- a/src/catch2/internal/catch_commandline.cpp
+++ b/src/catch2/internal/catch_commandline.cpp
@@ -62,11 +62,11 @@ namespace Catch {
};
auto const setTestOrder = [&]( std::string const& order ) {
if( startsWith( "declared", order ) )
- config.runOrder = RunTests::InDeclarationOrder;
+ config.runOrder = TestRunOrder::Declared;
else if( startsWith( "lexical", order ) )
- config.runOrder = RunTests::InLexicographicalOrder;
+ config.runOrder = TestRunOrder::LexicographicallySorted;
else if( startsWith( "random", order ) )
- config.runOrder = RunTests::InRandomOrder;
+ config.runOrder = TestRunOrder::Randomized;
else
return ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
return ParserResult::ok( ParseResultType::Matched );
diff --git a/src/catch2/internal/catch_test_case_registry_impl.cpp b/src/catch2/internal/catch_test_case_registry_impl.cpp
index 3aca929c..845d2512 100644
--- a/src/catch2/internal/catch_test_case_registry_impl.cpp
+++ b/src/catch2/internal/catch_test_case_registry_impl.cpp
@@ -46,15 +46,15 @@ namespace {
std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ) {
switch (config.runOrder()) {
- case RunTests::InDeclarationOrder:
+ case TestRunOrder::Declared:
return unsortedTestCases;
- case RunTests::InLexicographicalOrder: {
+ case TestRunOrder::LexicographicallySorted: {
std::vector<TestCaseHandle> sorted = unsortedTestCases;
std::sort(sorted.begin(), sorted.end());
return sorted;
}
- case RunTests::InRandomOrder: {
+ case TestRunOrder::Randomized: {
seedRng(config);
HashTest h(rng());
std::vector<std::pair<uint64_t, TestCaseHandle>> indexed_tests;
diff --git a/src/catch2/internal/catch_test_case_registry_impl.hpp b/src/catch2/internal/catch_test_case_registry_impl.hpp
index 4fd692fe..c06954b7 100644
--- a/src/catch2/internal/catch_test_case_registry_impl.hpp
+++ b/src/catch2/internal/catch_test_case_registry_impl.hpp
@@ -47,7 +47,7 @@ namespace Catch {
std::vector<Detail::unique_ptr<ITestInvoker>> m_invokers;
std::vector<TestCaseHandle> m_handles;
- mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+ mutable TestRunOrder m_currentSortOrder = TestRunOrder::Declared;
mutable std::vector<TestCaseHandle> m_sortedFunctions;
};