Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6692/mockpp/tests
Modified Files:
Formatter_test.cpp
Log Message:
fixes non-unicode and BCB5
Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Formatter_test.cpp 3 Mar 2005 15:49:36 -0000 1.21
+++ Formatter_test.cpp 5 Mar 2005 14:53:41 -0000 1.22
@@ -371,16 +371,16 @@
void Formatter_test::test_fmt_String()
{
mockpp::String fmt (MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"));
- fmt << MOCKPP_CHAR("0")
- << MOCKPP_CHAR("1")
- << MOCKPP_CHAR("2")
- << MOCKPP_CHAR("3")
- << MOCKPP_CHAR("4")
- << MOCKPP_CHAR("5")
- << MOCKPP_CHAR("6")
- << MOCKPP_CHAR("7")
- << MOCKPP_CHAR("8")
- << MOCKPP_CHAR("9");
+ fmt << MOCKPP_PCHAR("0")
+ << MOCKPP_PCHAR("1")
+ << MOCKPP_PCHAR("2")
+ << MOCKPP_PCHAR("3")
+ << MOCKPP_PCHAR("4")
+ << MOCKPP_PCHAR("5")
+ << MOCKPP_PCHAR("6")
+ << MOCKPP_PCHAR("7")
+ << MOCKPP_PCHAR("8")
+ << MOCKPP_PCHAR("9");
MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
}
@@ -388,19 +388,7 @@
void Formatter_test::test_fmt_Char()
{
- mockpp::String fmt (MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"));
- fmt << MOCKPP_CHAR('0')
- << MOCKPP_CHAR('1')
- << MOCKPP_CHAR('2')
- << MOCKPP_CHAR('3')
- << MOCKPP_CHAR('4')
- << MOCKPP_CHAR('5')
- << MOCKPP_CHAR('6')
- << MOCKPP_CHAR('7')
- << MOCKPP_CHAR('8')
- << MOCKPP_CHAR('9');
-
- MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
+ mockpp::String fmt;
fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
fmt << (signed char) ('0')
@@ -413,7 +401,6 @@
<< (signed char)('7')
<< (signed char)('8')
<< (signed char)('9');
-
MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
@@ -427,7 +414,32 @@
<< (unsigned char)('7')
<< (unsigned char)('8')
<< (unsigned char)('9');
+ MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
+
+ fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
+ fmt << (char)('0')
+ << (char)('1')
+ << (char)('2')
+ << (char)('3')
+ << (char)('4')
+ << (char)('5')
+ << (char)('6')
+ << (char)('7')
+ << (char)('8')
+ << (char)('9');
+ MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
+ fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0");
+ fmt << MOCKPP_CHAR('0')
+ << MOCKPP_CHAR('1')
+ << MOCKPP_CHAR('2')
+ << MOCKPP_CHAR('3')
+ << MOCKPP_CHAR('4')
+ << MOCKPP_CHAR('5')
+ << MOCKPP_CHAR('6')
+ << MOCKPP_CHAR('7')
+ << MOCKPP_CHAR('8')
+ << MOCKPP_CHAR('9');
MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210"));
}
|
