changed hex threshold on ints to 255
- and print it in *addition* to the decimal form
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index c4b3f15..60f8f82 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -98,19 +98,17 @@
std::string toString( int value ) {
std::ostringstream oss;
- if( value > 8192 )
- oss << "0x" << std::hex << value;
- else
- oss << value;
+ oss << value;
+ if( value >= 255 )
+ oss << " (0x" << std::hex << value << ")";
return oss.str();
}
std::string toString( unsigned long value ) {
std::ostringstream oss;
- if( value > 8192 )
- oss << "0x" << std::hex << value;
- else
- oss << value;
+ oss << value;
+ if( value >= 255 )
+ oss << " (0x" << std::hex << value << ")";
return oss.str();
}
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index c104545..744fab6 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -846,7 +846,9 @@
PASSED:
REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
with expansion:
- 0x<hex digits> > 4
+ 18446744073709551615 (0x<hex digits>)
+ >
+ 4
-------------------------------------------------------------------------------
comparisons between int variables
@@ -3398,7 +3400,7 @@
PASSED:
REQUIRE( Factorial(10) == 3628800 )
with expansion:
- 0x<hex digits> == 0x<hex digits>
+ 3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
-------------------------------------------------------------------------------
An empty test with no assertions
@@ -5827,7 +5829,7 @@
PASSED:
REQUIRE( 0x<hex digits> == o )
with expansion:
- 0x<hex digits> == {?}
+ 3221225472 (0x<hex digits>) == {?}
-------------------------------------------------------------------------------
Demonstrate that a non-const == is not used
@@ -5851,7 +5853,7 @@
PASSED:
REQUIRE( 0x<hex digits> == bit30and31 )
with expansion:
- 0x<hex digits> == 3221225472
+ 3221225472 (0x<hex digits>) == 3221225472
-------------------------------------------------------------------------------
boolean member
@@ -6308,9 +6310,9 @@
ToStringVector.cpp:<line number>:
PASSED:
- REQUIRE( Catch::toString(vv) == "{ 42, 512 }" )
+ REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
with expansion:
- "{ 42, 512 }" == "{ 42, 512 }"
+ "{ 42, 250 }" == "{ 42, 250 }"
-------------------------------------------------------------------------------
vector<string> -> toString
@@ -6358,9 +6360,9 @@
ToStringVector.cpp:<line number>:
PASSED:
- REQUIRE( Catch::toString(vv) == "{ 42, 512 }" )
+ REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
with expansion:
- "{ 42, 512 }" == "{ 42, 512 }"
+ "{ 42, 250 }" == "{ 42, 250 }"
-------------------------------------------------------------------------------
vec<vec<string,alloc>> -> toString
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 4d14a67..c0a75b7 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1063,7 +1063,9 @@
(std::numeric_limits<unsigned long>::max)() > ul
</Original>
<Expanded>
- 0x<hex digits> > 4
+ 18446744073709551615 (0x<hex digits>)
+>
+4
</Expanded>
</Expression>
<OverallResult success="true"/>
@@ -3519,7 +3521,7 @@
Factorial(10) == 3628800
</Original>
<Expanded>
- 0x<hex digits> == 0x<hex digits>
+ 3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
</Expanded>
</Expression>
<OverallResult success="true"/>
@@ -6009,7 +6011,7 @@
0x<hex digits> == o
</Original>
<Expanded>
- 0x<hex digits> == {?}
+ 3221225472 (0x<hex digits>) == {?}
</Expanded>
</Expression>
<OverallResult success="true"/>
@@ -6031,7 +6033,7 @@
0x<hex digits> == bit30and31
</Original>
<Expanded>
- 0x<hex digits> == 3221225472
+ 3221225472 (0x<hex digits>) == 3221225472
</Expanded>
</Expression>
<OverallResult success="true"/>
@@ -6439,10 +6441,10 @@
</Expression>
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
<Original>
- Catch::toString(vv) == "{ 42, 512 }"
+ Catch::toString(vv) == "{ 42, 250 }"
</Original>
<Expanded>
- "{ 42, 512 }" == "{ 42, 512 }"
+ "{ 42, 250 }" == "{ 42, 250 }"
</Expanded>
</Expression>
<OverallResult success="true"/>
@@ -6495,10 +6497,10 @@
</Expression>
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
<Original>
- Catch::toString(vv) == "{ 42, 512 }"
+ Catch::toString(vv) == "{ 42, 250 }"
</Original>
<Expanded>
- "{ 42, 512 }" == "{ 42, 512 }"
+ "{ 42, 250 }" == "{ 42, 250 }"
</Expanded>
</Expression>
<OverallResult success="true"/>
diff --git a/projects/SelfTest/ToStringVector.cpp b/projects/SelfTest/ToStringVector.cpp
index 4479060..c3a8d4e 100644
--- a/projects/SelfTest/ToStringVector.cpp
+++ b/projects/SelfTest/ToStringVector.cpp
@@ -9,8 +9,8 @@
REQUIRE( Catch::toString(vv) == "{ }" );
vv.push_back( 42 );
REQUIRE( Catch::toString(vv) == "{ 42 }" );
- vv.push_back( 512 );
- REQUIRE( Catch::toString(vv) == "{ 42, 512 }" );
+ vv.push_back( 250 );
+ REQUIRE( Catch::toString(vv) == "{ 42, 250 }" );
}
TEST_CASE( "vector<string> -> toString", "[toString][vector]" )
@@ -57,8 +57,8 @@
REQUIRE( Catch::toString(vv) == "{ }" );
vv.push_back( 42 );
REQUIRE( Catch::toString(vv) == "{ 42 }" );
- vv.push_back( 512 );
- REQUIRE( Catch::toString(vv) == "{ 42, 512 }" );
+ vv.push_back( 250 );
+ REQUIRE( Catch::toString(vv) == "{ 42, 250 }" );
}
TEST_CASE( "vec<vec<string,alloc>> -> toString", "[toString][vector,allocator]" ) {