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

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest/ToStringPair.cpp
diff options
context:
space:
mode:
authorPhil Nash2015-03-27 17:54:45 +0000
committerPhil Nash2015-03-27 17:54:45 +0000
commitd9fbc620930136ef9250269d73aa1d1a5f76da31 (patch)
tree891b77187e1168778f11c7a4b7b1d64de548e714 /projects/SelfTest/ToStringPair.cpp
parentb9ec8a10edd66009c2e79af9a7f789b6547180bc (diff)
parent0ae7578028fe30135015ace15a97009a547f2d46 (diff)
downloadcatch3-d9fbc620930136ef9250269d73aa1d1a5f76da31.tar.gz
Merged from develop
Diffstat (limited to 'projects/SelfTest/ToStringPair.cpp')
-rw-r--r--projects/SelfTest/ToStringPair.cpp47
1 files changed, 47 insertions, 0 deletions
diff --git a/projects/SelfTest/ToStringPair.cpp b/projects/SelfTest/ToStringPair.cpp
new file mode 100644
index 00000000..8f510700
--- /dev/null
+++ b/projects/SelfTest/ToStringPair.cpp
@@ -0,0 +1,47 @@
+#include "catch.hpp"
+
+// === Pair ===
+namespace Catch {
+ // Note: If we put this in the right place in catch_tostring, then
+ // we can make it an overload of Catch::toString
+ template<typename T1, typename T2>
+ struct StringMaker<std::pair<T1,T2> > {
+ static std::string convert( const std::pair<T1,T2>& pair ) {
+ std::ostringstream oss;
+ oss << "{ "
+ << toString( pair.first )
+ << ", "
+ << toString( pair.second )
+ << " }";
+ return oss.str();
+ }
+ };
+}
+
+TEST_CASE( "std::pair<int,std::string> -> toString", "[toString][pair]" ) {
+ std::pair<int,std::string> value( 34, "xyzzy" );
+ REQUIRE( Catch::toString( value ) == "{ 34, \"xyzzy\" }" );
+}
+
+TEST_CASE( "std::pair<int,const std::string> -> toString", "[toString][pair]" ) {
+ std::pair<int,const std::string> value( 34, "xyzzy" );
+ REQUIRE( Catch::toString(value) == "{ 34, \"xyzzy\" }" );
+}
+
+TEST_CASE( "std::vector<std::pair<std::string,int> > -> toString", "[toString][pair]" ) {
+ std::vector<std::pair<std::string,int> > pr;
+ pr.push_back( std::make_pair("green", 55 ) );
+ REQUIRE( Catch::toString( pr ) == "{ { \"green\", 55 } }" );
+}
+
+// This is pretty contrived - I figure if this works, anything will...
+TEST_CASE( "pair<pair<int,const char *,pair<std::string,int> > -> toString", "[toString][pair]" ) {
+ typedef std::pair<int,const char *> left_t;
+ typedef std::pair<std::string,int> right_t;
+
+ left_t left( 42, "Arthur" );
+ right_t right( "Ford", 24 );
+
+ std::pair<left_t,right_t> pair( left, right );
+ REQUIRE( Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" );
+}