3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-30 19:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move Approx out of the Detail namespace

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/catch.hpp
View File

@@ -60,6 +60,4 @@
#include <catch2/catch_reenable_warnings.h>
using Catch::Detail::Approx;
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

13
src/catch2/catch_approx.cpp
View File

@@ -23,7 +23,6 @@ bool marginComparison(double lhs, double rhs, double margin) {
}
namespace Catch {
namespace Detail {
Approx::Approx ( double value )
: m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
@@ -70,18 +69,16 @@ namespace Detail {
m_epsilon = newEpsilon;
}
} // end namespace Detail
namespace literals {
Detail::Approx operator "" _a(long double val) {
return Detail::Approx(val);
Approx operator "" _a(long double val) {
return Approx(val);
}
Detail::Approx operator "" _a(unsigned long long val) {
return Detail::Approx(val);
Approx operator "" _a(unsigned long long val) {
return Approx(val);
}
} // end namespace literals
std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
std::string StringMaker<Catch::Approx>::convert(Catch::Approx const& value) {
return value.toString();
}

10
src/catch2/catch_approx.h
View File

@@ -13,7 +13,6 @@
#include <type_traits>
namespace Catch {
namespace Detail {
class Approx {
private:
@@ -115,16 +114,15 @@ namespace Detail {
double m_scale;
double m_value;
};
} // end namespace Detail
namespace literals {
Detail::Approx operator "" _a(long double val);
Detail::Approx operator "" _a(unsigned long long val);
Approx operator "" _a(long double val);
Approx operator "" _a(unsigned long long val);
} // end namespace literals
template<>
struct StringMaker<Catch::Detail::Approx> {
static std::string convert(Catch::Detail::Approx const& value);
struct StringMaker<Catch::Approx> {
static std::string convert(Catch::Approx const& value);
};
} // end namespace Catch

2
src/catch2/catch_matchers_vector.h
View File

@@ -124,7 +124,7 @@ namespace Matchers {
}
std::vector<T> const& m_comparator;
mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
mutable Catch::Approx approx = Catch::Approx::custom();
};
template<typename T>

2
tests/SelfTest/Baselines/compact.sw.approved.txt
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

2
tests/SelfTest/Baselines/console.sw.approved.txt
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 )

2
tests/SelfTest/Baselines/tap.sw.approved.txt
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

2
tests/SelfTest/Baselines/xml.sw.approved.txt
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 )

2
tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
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") {

2
tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
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.;

2
tests/SelfTest/UsageTests/Approx.tests.cpp
View File

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

2
tests/SelfTest/UsageTests/Condition.tests.cpp
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>