[Mockpp-commits] mockpp/mockpp/tests Formatter_test.cpp,1.23,1.24 VisitableMockObject_5_test.cpp,1.24,1.25

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10006/tests

Modified Files:
	Formatter_test.cpp VisitableMockObject_5_test.cpp 
Log Message:
fixes bcb5/g++ 2.95

Index: VisitableMockObject_5_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- VisitableMockObject_5_test.cpp	24 Mar 2005 21:43:07 -0000	1.24
+++ VisitableMockObject_5_test.cpp	10 Apr 2005 12:33:53 -0000	1.25
@@ -50,6 +50,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
+
 class VisitableMockObject_5_test : public CppUnit::TestFixture
 {
  public:
@@ -114,6 +115,7 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VisitableMockObject_5_test);
 
+
 class MyVisitableMockObject_5_Interface
 {
   public:

Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Formatter_test.cpp	9 Apr 2005 15:32:45 -0000	1.23
+++ Formatter_test.cpp	10 Apr 2005 12:33:53 -0000	1.24
@@ -404,7 +404,11 @@
 #ifndef MOCKPP_MAKE_CHAR_READABLE
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
 #else
+# ifdef __BORLANDC__
+  MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{" "\x22" "9" "\x22" ", 0x39}{" "\x22" "8" "\x22" ", 0x38}{" "\x22" "7" "\x22" ", 0x37}{" "\x22" "6" "\x22" ", 0x36}{" "\x22" "5" "\x22" ", 0x35}{" "\x22" "4" "\x22" ", 0x34}{" "\x22" "3" "\x22" ", 0x33}{" "\x22" "2" "\x22" ", 0x32}{" "\x22" "1" "\x22" ", 0x31}{" "\x22" "0" "\x22" ", 0x30}"));
+# else
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}"));
+# endif
 #endif
 
   fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
@@ -421,7 +425,11 @@
 #ifndef MOCKPP_MAKE_CHAR_READABLE
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
 #else
+# ifdef __BORLANDC__
+  MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{" "\x22" "9" "\x22" ", 0x39}{" "\x22" "8" "\x22" ", 0x38}{" "\x22" "7" "\x22" ", 0x37}{" "\x22" "6" "\x22" ", 0x36}{" "\x22" "5" "\x22" ", 0x35}{" "\x22" "4" "\x22" ", 0x34}{" "\x22" "3" "\x22" ", 0x33}{" "\x22" "2" "\x22" ", 0x32}{" "\x22" "1" "\x22" ", 0x31}{" "\x22" "0" "\x22" ", 0x30}"));
+# else
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}"));
+# endif
 #endif
 
   fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
@@ -438,7 +446,11 @@
 #ifndef MOCKPP_MAKE_CHAR_READABLE
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
 #else
+# ifdef __BORLANDC__
+  MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{" "\x22" "9" "\x22" ", 0x39}{" "\x22" "8" "\x22" ", 0x38}{" "\x22" "7" "\x22" ", 0x37}{" "\x22" "6" "\x22" ", 0x36}{" "\x22" "5" "\x22" ", 0x35}{" "\x22" "4" "\x22" ", 0x34}{" "\x22" "3" "\x22" ", 0x33}{" "\x22" "2" "\x22" ", 0x32}{" "\x22" "1" "\x22" ", 0x31}{" "\x22" "0" "\x22" ", 0x30}"));
+# else
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}"));
+# endif
 #endif
 
   fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
@@ -455,7 +467,11 @@
 #ifndef MOCKPP_MAKE_CHAR_READABLE
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
 #else
+# ifdef __BORLANDC__
+  MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{" "\x22" "9" "\x22" ", 0x39}{" "\x22" "8" "\x22" ", 0x38}{" "\x22" "7" "\x22" ", 0x37}{" "\x22" "6" "\x22" ", 0x36}{" "\x22" "5" "\x22" ", 0x35}{" "\x22" "4" "\x22" ", 0x34}{" "\x22" "3" "\x22" ", 0x33}{" "\x22" "2" "\x22" ", 0x32}{" "\x22" "1" "\x22" ", 0x31}{" "\x22" "0" "\x22" ", 0x30}"));
+# else
   MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}"));
+# endif
 #endif
 }