[Cppunit-cvs] cppunit2/src/cpput assertstring.cpp,1.2,1.3

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/src/cpput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1959/src/cpput

Modified Files:
	assertstring.cpp 
Log Message:
* use ConstString instead of std::string
* moved quoteString() from cpput/assertstring to cpptl/stringtools.h.

Index: assertstring.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/assertstring.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assertstring.cpp	1 Feb 2004 16:12:56 -0000	1.2
--- assertstring.cpp	27 Feb 2005 10:13:37 -0000	1.3
***************
*** 14,19 ****
     Message newMessage( message );
     newMessage.add( translate( "String does not start with the expected pattern." ) );
!    newMessage.add( translate( "Expected start: " ) + quoteString( pattern ) );
!    newMessage.add( translate( "Actual string:  " ) + quoteString( string ) );
     fail( newMessage );
  }
--- 14,19 ----
     Message newMessage( message );
     newMessage.add( translate( "String does not start with the expected pattern." ) );
!    newMessage.add( translate( "Expected start: " ) + CppTL::quoteString( pattern ) );
!    newMessage.add( translate( "Actual string:  " ) + CppTL::quoteString( string ) );
     fail( newMessage );
  }
***************
*** 31,36 ****
     Message newMessage( message );
     newMessage.add( translate( "String does not end with the expected pattern." ) );
!    newMessage.add( translate( "Expected end:  " ) + quoteString( pattern ) );
!    newMessage.add( translate( "Actual string: " ) + quoteString( string ) );
     fail( newMessage );
  }
--- 31,36 ----
     Message newMessage( message );
     newMessage.add( translate( "String does not end with the expected pattern." ) );
!    newMessage.add( translate( "Expected end:  " ) + CppTL::quoteString( pattern ) );
!    newMessage.add( translate( "Actual string: " ) + CppTL::quoteString( string ) );
     fail( newMessage );
  }
***************
*** 47,52 ****
     Message newMessage( message );
     newMessage.add( translate( "String does not contain the expected pattern." ) );
!    newMessage.add( translate( "Expected pattern: " ) + quoteString( pattern ) );
!    newMessage.add( translate( "Actual string: " ) + quoteString( string ) );
     fail( newMessage );
  }
--- 47,52 ----
     Message newMessage( message );
     newMessage.add( translate( "String does not contain the expected pattern." ) );
!    newMessage.add( translate( "Expected pattern: " ) + CppTL::quoteString( pattern ) );
!    newMessage.add( translate( "Actual string: " ) + CppTL::quoteString( string ) );
     fail( newMessage );
  }
***************
*** 76,143 ****
     newMessage.add( translate( "Strings are not equal." ) );
     if ( !common.empty() )
!       newMessage.add( translate( "Common: " ) + quoteString( common ) );
     newMessage.add( translate( "Divergence position (0 based): " ) + stringize( differenceIndex ) );
!    newMessage.add( translate( "Expected (at divergence): " ) + quoteString( expectedTail ) );
!    newMessage.add( translate( "Actual (at divergence):   " ) + quoteString( actualTail ) );
     fail( newMessage );
  }
  
- 
- std::string hex( unsigned int value )
- {
-   static const char *digit = "0123456789abcdef";
-   std::string hexa;
-   do
-   {
-     hexa += digit[ value & 15 ];
-     value /= 16;
-   }
-   while ( value != 0 );
- 
-   std::reverse( hexa.begin(), hexa.end() );
-   return hexa;
- }
- 
- 
- std::string escapeControl( char c )
- {
-   if ( c == '\n' )
-     return "\\n";
-   else if ( c == '\t' )
-     return "\\t";
-   else if ( c == '\r' )
-     return "\\r";
-   else if ( c == '\v' )
-     return "\\v";
-   return "\\x" + hex( (unsigned)c );
- }
- 
- 
- std::string escape( char c )
- {
-   if ( c >=0  &&  c < 32 )
-     return escapeControl( c );
-   else if ( c == '\\' )
-     return "\\\\";
-   return std::string( 1, c );
- }
- 
- 
- // need to expose some of those utility functions...
- std::string escape( const std::string &text )
- {
-   std::string escaped;
-   escaped.reserve( text.length() + 16 );
-   std::string::const_iterator it = text.begin();
-   while ( it != text.end() )
-     escaped += escape( *it++ );
-   return escaped;
- }
- 
- 
- std::string quoteString( const std::string &str )
- {
-    return "\"" + escape(str) + "\"";
- }
- 
  } // namespace CppUT
--- 76,85 ----
     newMessage.add( translate( "Strings are not equal." ) );
     if ( !common.empty() )
!       newMessage.add( translate( "Common: " ) + CppTL::quoteString( common ) );
     newMessage.add( translate( "Divergence position (0 based): " ) + stringize( differenceIndex ) );
!    newMessage.add( translate( "Expected (at divergence): " ) + CppTL::quoteString( expectedTail ) );
!    newMessage.add( translate( "Actual (at divergence):   " ) + CppTL::quoteString( actualTail ) );
     fail( newMessage );
  }
  
  } // namespace CppUT