From: Francesco Montorsi Date: Sun, 23 May 2010 19:07:43 +0000 (+0000) Subject: remove streams tests: they're very basic and already-existing CppUnit stream tests... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4090fe84c47112e59b7a3e88bc805c781ee4d10d remove streams tests: they're very basic and already-existing CppUnit stream tests are much more complete and extended. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/console/console.cpp b/samples/console/console.cpp index ccd1364776..26f7ce0f19 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -130,7 +130,6 @@ // #define TEST_SOCKETS --FIXME! (RN) #define TEST_STACKWALKER #define TEST_STDPATHS - #define TEST_STREAMS #else // #if TEST_ALL #define TEST_DATETIME #define TEST_VOLUME @@ -2755,77 +2754,6 @@ static void TestStandardPaths() #endif // TEST_STDPATHS -// ---------------------------------------------------------------------------- -// streams -// ---------------------------------------------------------------------------- - -#ifdef TEST_STREAMS - -#include "wx/wfstream.h" -#include "wx/mstream.h" - -static void TestFileStream() -{ - wxPuts(wxT("*** Testing wxFileInputStream ***")); - - static const wxString filename = wxT("testdata.fs"); - { - wxFileOutputStream fsOut(filename); - fsOut.Write("foo", 3); - } - - { - wxFileInputStream fsIn(filename); - wxPrintf(wxT("File stream size: %u\n"), fsIn.GetSize()); - int c; - while ( (c=fsIn.GetC()) != wxEOF ) - { - wxPutchar(c); - } - } - - if ( !wxRemoveFile(filename) ) - { - wxPrintf(wxT("ERROR: failed to remove the file '%s'.\n"), filename.c_str()); - } - - wxPuts(wxT("\n*** wxFileInputStream test done ***")); -} - -static void TestMemoryStream() -{ - wxPuts(wxT("*** Testing wxMemoryOutputStream ***")); - - wxMemoryOutputStream memOutStream; - wxPrintf(wxT("Initially out stream offset: %lu\n"), - (unsigned long)memOutStream.TellO()); - - for ( const wxChar *p = wxT("Hello, stream!"); *p; p++ ) - { - memOutStream.PutC(*p); - } - - wxPrintf(wxT("Final out stream offset: %lu\n"), - (unsigned long)memOutStream.TellO()); - - wxPuts(wxT("*** Testing wxMemoryInputStream ***")); - - wxChar buf[1024]; - size_t len = memOutStream.CopyTo(buf, WXSIZEOF(buf)); - - wxMemoryInputStream memInpStream(buf, len); - wxPrintf(wxT("Memory stream size: %u\n"), memInpStream.GetSize()); - int c; - while ( (c=memInpStream.GetC()) != wxEOF ) - { - wxPutchar(c); - } - - wxPuts(wxT("\n*** wxMemoryInputStream test done ***")); -} - -#endif // TEST_STREAMS - // ---------------------------------------------------------------------------- // wxVolume tests // ---------------------------------------------------------------------------- @@ -3194,13 +3122,6 @@ int main(int argc, char **argv) TestSocketClient(); #endif // TEST_SOCKETS -#ifdef TEST_STREAMS - #if TEST_ALL - TestFileStream(); - #endif - TestMemoryStream(); -#endif // TEST_STREAMS - #ifdef TEST_DATETIME #if TEST_INTERACTIVE TestDateTimeInteractive();