[Mockpp-commits] mockpp/mockpp/tests Formatter_test.cpp,1.26,1.27

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

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

Modified Files:
	Formatter_test.cpp 
Log Message:
better ostream reuse

Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Formatter_test.cpp	23 Jul 2005 22:34:32 -0000	1.26
+++ Formatter_test.cpp	24 Jul 2005 17:48:34 -0000	1.27
@@ -498,23 +498,28 @@
 };
 
 
-std::basic_ostream<char> &
-  operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/)
+#ifdef MOCKPP_UNICODE
+
+std::basic_ostream<wchar_t> &
+  operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/)
 {
-  os << "Formatter_Dummy-char";
+  os << "Formatter_Dummy-wchar_t";
   return os;
 }
 
+MOCKPP_OWSTREAMABLE(Formatter_Dummy)
 
-#ifdef MOCKPP_UNICODE
+#else // MOCKPP_UNICODE
 
-std::basic_ostream<wchar_t> &
-  operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/)
+std::basic_ostream<char> &
+  operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/)
 {
-  os << "Formatter_Dummy-wchar_t";
+  os << "Formatter_Dummy-char";
   return os;
 }
 
+MOCKPP_OSTREAMABLE(Formatter_Dummy)
+
 #endif // MOCKPP_UNICODE
 
 
@@ -524,18 +529,33 @@
 #ifndef MOCKPP_DISABLE_OSTREAMED
 
   Formatter_Dummy fd;
-  {
-    mockpp::String fmt (MOCKPP_PCHAR("==%0=="));
-    fmt << ostreamed(fd);
-    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-char=="));
-  }
 
 #ifdef MOCKPP_UNICODE
 
   {
-    mockpp::String fmt (MOCKPP_PCHAR("==%0=="));
+    mockpp::String fmt (MOCKPP_PCHAR("1==%0=="));
     fmt << owstreamed(fd);
-    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-wchar_t=="));
+    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-wchar_t=="));
+  }
+
+  {
+    mockpp::String fmt (MOCKPP_PCHAR("2==%0=="));
+    fmt << fd;
+    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("2==Formatter_Dummy-wchar_t=="));
+  }
+
+#else // MOCKPP_UNICODE
+
+  {
+    mockpp::String fmt (MOCKPP_PCHAR("1==%0=="));
+    fmt << ostreamed(fd);
+    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-char=="));
+  }
+
+  {
+    mockpp::String fmt (MOCKPP_PCHAR("2==%0=="));
+    fmt << fd;
+    MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("2==Formatter_Dummy-char=="));
   }
 
 #endif // MOCKPP_UNICODE