added a trivial test for wxString stream insertion operators

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c74478c27febb202d35d8b180dcfffda9ac79c46..b771431d637e4197bbeae47db07ac6816d3e38e8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -71,6 +71,7 @@ TEST_OBJECTS =  \
        test_regextest.o \
        test_wxregextest.o \
        test_scopeguardtest.o \
+       test_iostream.o \
        test_strings.o \
        test_stdstrings.o \
        test_tokenizer.o \
@@ -378,6 +379,9 @@ test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp $(TEST_ODEP)
 test_scopeguardtest.o: $(srcdir)/scopeguard/scopeguardtest.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/scopeguard/scopeguardtest.cpp
 
+test_iostream.o: $(srcdir)/strings/iostream.cpp $(TEST_ODEP)
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/iostream.cpp
+
 test_strings.o: $(srcdir)/strings/strings.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/strings.cpp
 

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index d1ccea5631e9574f44365419713c117ab0b19e16..53a8ad2b9286386173290e70a8ebf82bd004d878 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -59,6 +59,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_regextest.obj \
        $(OBJS)\test_wxregextest.obj \
        $(OBJS)\test_scopeguardtest.obj \
+       $(OBJS)\test_iostream.obj \
        $(OBJS)\test_strings.obj \
        $(OBJS)\test_stdstrings.obj \
        $(OBJS)\test_tokenizer.obj \
@@ -406,6 +407,9 @@ $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
 $(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 843ad17f4f31fb17835fd8376f8c2cd2bab6154d..ea3ab05edf93842c4eed1e54cee6c2e248b66d58 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -51,6 +51,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_regextest.o \
        $(OBJS)\test_wxregextest.o \
        $(OBJS)\test_scopeguardtest.o \
+       $(OBJS)\test_iostream.o \
        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_tokenizer.o \
@@ -384,6 +385,9 @@ $(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
 $(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_iostream.o: ./strings/iostream.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_strings.o: ./strings/strings.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 45af219d8494cbd425700a7670789763e7481474..5acd06251c76262e23e128b1d8cd5d7d1ea6e98c 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -52,6 +52,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_regextest.obj \
        $(OBJS)\test_wxregextest.obj \
        $(OBJS)\test_scopeguardtest.obj \
+       $(OBJS)\test_iostream.obj \
        $(OBJS)\test_strings.obj \
        $(OBJS)\test_stdstrings.obj \
        $(OBJS)\test_tokenizer.obj \
@@ -491,6 +492,9 @@ $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
 $(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 5e877a9193498cbbd7ba9bff7576f631bd5f296b..65d759884b36d05a59dcf66ab57f96f91747d1cc 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -256,6 +256,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_regextest.obj &
        $(OBJS)\test_wxregextest.obj &
        $(OBJS)\test_scopeguardtest.obj &
+       $(OBJS)\test_iostream.obj &
        $(OBJS)\test_strings.obj &
        $(OBJS)\test_stdstrings.obj &
        $(OBJS)\test_tokenizer.obj &
@@ -439,6 +440,9 @@ $(OBJS)\test_wxregextest.obj :  .AUTODEPEND .\regex\wxregextest.cpp
 $(OBJS)\test_scopeguardtest.obj :  .AUTODEPEND .\scopeguard\scopeguardtest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_iostream.obj :  .AUTODEPEND .\strings\iostream.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 

diff --git a/tests/strings/iostream.cpp b/tests/strings/iostream.cpp
new file mode 100644 (file)
index 0000000..6e40cbb
--- /dev/null
+++ b/tests/strings/iostream.cpp
@@ -0,0 +1,61 @@
+//////////////////////////////////////////////////////////////////////////////
+// Name:        tests/strings/iostream.cpp
+// Purpose:     unit test of wxString interaction with std::[io]stream
+// Author:      Vadim Zeitlin
+// Created:     2007-10-09
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif // WX_PRECOMP
+
+#include <sstream>
+
+#define ASSERT_OSTREAM_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(std::string(p), s.str())
+#define ASSERT_WOSTREAM_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(std::wstring(p), s.str())
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class StringIostreamTestCase : public CppUnit::TestCase
+{
+public:
+    StringIostreamTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( StringIostreamTestCase );
+        CPPUNIT_TEST( Out );
+    CPPUNIT_TEST_SUITE_END();
+
+    void Out();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( StringIostreamTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StringIostreamTestCase, "StringIostream" );
+
+void StringIostreamTestCase::Out()
+{
+    std::ostringstream s;
+    s << wxString("hello");
+    ASSERT_OSTREAM_EQUAL("hello", s);
+
+    std::wostringstream ws;
+    ws << wxString("bye");
+    ASSERT_WOSTREAM_EQUAL(L"bye", ws);
+}
+

diff --git a/tests/test.bkl b/tests/test.bkl
index 9ed82fbe3e5e322da472ca7be2e487b702938074..405d0115e92db96c9e9fe4cd0868a16351785995 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -45,6 +45,7 @@
             regex/regextest.cpp
             regex/wxregextest.cpp
             scopeguard/scopeguardtest.cpp
+            strings/iostream.cpp
             strings/strings.cpp
             strings/stdstrings.cpp
             strings/tokenizer.cpp

diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index b4965b1f855c672711224b90207aa2ff467caf12..79ada9f0538d27695e3d3921c511e1fd9848c169 100644 (file)
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -521,6 +521,10 @@ SOURCE=.\intl\intltest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\strings\iostream.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\streams\largefile.cpp\r
 # End Source File\r
 # Begin Source File\r