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

summaryrefslogtreecommitdiffhomepage
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
parent60cc4c293d4d7d984a0f01397270ce592a397de5 (diff)
downloadcatch3-b0531404e4cdd31d63bebbc21d9a4556922a0626.tar.gz
Turn RunTests into TestRunOrder enum class
-rw-r--r--src/catch2/catch_config.cpp2
-rw-r--r--src/catch2/catch_config.hpp4
-rw-r--r--src/catch2/interfaces/catch_interfaces_config.hpp12
-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
6 files changed, 16 insertions, 16 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 93acc690..a0aa3595 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -72,7 +72,7 @@ namespace Catch {
bool Config::warnAboutNoTests() const { return !!(m_data.warnings & WarnAbout::NoTests); }
ShowDurations Config::showDurations() const { return m_data.showDurations; }
double Config::minDuration() const { return m_data.minDuration; }
- RunTests::InWhatOrder Config::runOrder() const { return m_data.runOrder; }
+ TestRunOrder Config::runOrder() const { return m_data.runOrder; }
unsigned int Config::rngSeed() const { return m_data.rngSeed; }
UseColour::YesOrNo Config::useColour() const { return m_data.useColour; }
bool Config::shouldDebugBreak() const { return m_data.shouldDebugBreak; }
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index 778d6cdd..d3c113ff 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -45,7 +45,7 @@ namespace Catch {
WarnAbout::What warnings = WarnAbout::Nothing;
ShowDurations showDurations = ShowDurations::DefaultForReporter;
double minDuration = -1;
- RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+ TestRunOrder runOrder = TestRunOrder::Declared;
UseColour::YesOrNo useColour = UseColour::Auto;
WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
@@ -96,7 +96,7 @@ namespace Catch {
bool warnAboutNoTests() const override;
ShowDurations showDurations() const override;
double minDuration() const override;
- RunTests::InWhatOrder runOrder() const override;
+ TestRunOrder runOrder() const override;
unsigned int rngSeed() const override;
UseColour::YesOrNo useColour() const override;
bool shouldDebugBreak() const override;
diff --git a/src/catch2/interfaces/catch_interfaces_config.hpp b/src/catch2/interfaces/catch_interfaces_config.hpp
index 39cc2bf7..2ebfd411 100644
--- a/src/catch2/interfaces/catch_interfaces_config.hpp
+++ b/src/catch2/interfaces/catch_interfaces_config.hpp
@@ -34,11 +34,11 @@ namespace Catch {
Always,
Never
};
- struct RunTests { enum InWhatOrder {
- InDeclarationOrder,
- InLexicographicalOrder,
- InRandomOrder
- }; };
+ enum class TestRunOrder {
+ Declared,
+ LexicographicallySorted,
+ Randomized
+ };
struct UseColour { enum YesOrNo {
Auto,
Yes,
@@ -71,7 +71,7 @@ namespace Catch {
virtual TestSpec const& testSpec() const = 0;
virtual bool hasTestFilters() const = 0;
virtual std::vector<std::string> const& getTestsOrTags() const = 0;
- virtual RunTests::InWhatOrder runOrder() const = 0;
+ virtual TestRunOrder runOrder() const = 0;
virtual unsigned int rngSeed() const = 0;
virtual UseColour::YesOrNo useColour() const = 0;
virtual std::vector<std::string> const& getSectionsToRun() const = 0;
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;
};