Move Approx out of the Detail namespace

This commit is contained in:
Martin Hořeňovský
2020-02-03 15:07:59 +01:00
parent bd9520c0f9
commit c3a5e21648
12 changed files with 18 additions and 25 deletions

View File

@@ -1108,7 +1108,7 @@ CmdLine.tests.cpp:<line number>: passed: config.benchmarkSamples == 200 for: 200
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-resamples=20000" }) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.benchmarkResamples == 20000 for: 20000 (0x<hex digits>) == 20000 (0x<hex digits>)
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-confidence-interval=0.99" }) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) for: 0.99 == Approx( 0.99 )
CmdLine.tests.cpp:<line number>: passed: config.benchmarkConfidenceInterval == Catch::Approx(0.99) for: 0.99 == Approx( 0.99 )
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-no-analysis" }) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.benchmarkNoAnalysis for: true
Misc.tests.cpp:<line number>: passed: std::tuple_size<TestType>::value >= 1 for: 3 >= 1

View File

@@ -8022,7 +8022,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) )
REQUIRE( config.benchmarkConfidenceInterval == Catch::Approx(0.99) )
with expansion:
0.99 == Approx( 0.99 )

View File

@@ -2139,7 +2139,7 @@ ok 1067 - config.benchmarkResamples == 20000 for: 20000 (0x<hex digits>) == 2000
# Process can be configured on command line
ok 1068 - cli.parse({ "test", "--benchmark-confidence-interval=0.99" }) for: {?}
# Process can be configured on command line
ok 1069 - config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) for: 0.99 == Approx( 0.99 )
ok 1069 - config.benchmarkConfidenceInterval == Catch::Approx(0.99) for: 0.99 == Approx( 0.99 )
# Process can be configured on command line
ok 1070 - cli.parse({ "test", "--benchmark-no-analysis" }) for: {?}
# Process can be configured on command line

View File

@@ -10103,7 +10103,7 @@ Nor would this
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99)
config.benchmarkConfidenceInterval == Catch::Approx(0.99)
</Original>
<Expanded>
0.99 == Approx( 0.99 )

View File

@@ -489,7 +489,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
SECTION("resamples") {
CHECK(cli.parse({ "test", "--benchmark-confidence-interval=0.99" }));
REQUIRE(config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99));
REQUIRE(config.benchmarkConfidenceInterval == Catch::Approx(0.99));
}
SECTION("resamples") {

View File

@@ -178,7 +178,7 @@ TEST_CASE("Generators internals", "[generators][internals]") {
}
SECTION("Floating Point") {
using Catch::Detail::Approx;
using Catch::Approx;
SECTION("Exact") {
const auto rangeStart = -1.;
const auto rangeEnd = 1.;

View File

@@ -11,7 +11,7 @@
#include <cmath>
using Catch::Detail::Approx;
using Catch::Approx;
namespace { namespace ApproxTests {

View File

@@ -14,7 +14,7 @@
#include <catch2/catch_approx.h>
#include <catch2/catch_test_macros.hpp>
using Catch::Detail::Approx;
using Catch::Approx;
#include <string>
#include <limits>