[Box Backup-commit] COMMIT r3060 - box/trunk/lib/common

[subversion at boxbackup.org]

Author: chris
Date: 2012-01-22 16:19:19 +0000 (Sun, 22 Jan 2012)
New Revision: 3060

Modified:
   box/trunk/lib/common/Test.h
Log:
Log disabling of exception logging to help understand test output.

Allow std::ostringstream formatting in expected/actual output comparison.


Modified: box/trunk/lib/common/Test.h
===================================================================
--- box/trunk/lib/common/Test.h	2012-01-22 16:17:36 UTC (rev 3059)
+++ box/trunk/lib/common/Test.h	2012-01-22 16:19:19 UTC (rev 3060)
@@ -55,6 +55,8 @@
 	{ \
 		bool didthrow = false; \
 		HideExceptionMessageGuard hide; \
+		BOX_TRACE("Exception logging disabled at " __FILE__ ":" \
+			<< __LINE__); \
 		try \
 		{ \
 			statement; \
@@ -91,8 +93,8 @@
 	\
 	if(_exp_str != _found_str) \
 	{ \
-		printf("Expected <%s> but found <%s>\n", \
-			_exp_str.c_str(), _found_str.c_str()); \
+		BOX_ERROR("Expected <" << _exp_str << "> but found <" << \
+			_found_str << ">"); \
 		\
 		std::ostringstream _oss3; \
 		_oss3 << #_found << " != " << #_expected; \