Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move TestTextInputStream() function in CppUnit's TextStreamTestCase class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-05-16 14:31:00 +00:00
parent 3f6e622f7c
commit 3dea816bd2
2 changed files with 21 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
samples/console/console.cpp
View File

@@ -131,7 +131,6 @@
#define TEST_STACKWALKER
#define TEST_STDPATHS
#define TEST_STREAMS
#define TEST_TEXTSTREAM
#define TEST_TIMER
// #define TEST_VOLUME --FIXME! (RN)
#define TEST_WCHAR
@@ -3445,45 +3444,6 @@ static void TestTimeSpanFormat()
#endif // TEST_DATETIME
// ----------------------------------------------------------------------------
// wxTextInput/OutputStream
// ----------------------------------------------------------------------------
#ifdef TEST_TEXTSTREAM
#include "wx/txtstrm.h"
#include "wx/wfstream.h"
static void TestTextInputStream()
{
wxPuts(wxT("\n*** wxTextInputStream test ***"));
wxString filename = wxT("testdata.fc");
wxFileInputStream fsIn(filename);
if ( !fsIn.Ok() )
{
wxPuts(wxT("ERROR: couldn't open file."));
}
else
{
wxTextInputStream tis(fsIn);
size_t line = 1;
for ( ;; )
{
const wxString s = tis.ReadLine();
// line could be non empty if the last line of the file isn't
// terminated with EOL
if ( fsIn.Eof() && s.empty() )
break;
wxPrintf(wxT("Line %d: %s\n"), line++, s.c_str());
}
}
}
#endif // TEST_TEXTSTREAM
// ----------------------------------------------------------------------------
// entry point
@@ -3748,10 +3708,6 @@ int main(int argc, char **argv)
TestMemoryStream();
#endif // TEST_STREAMS
#ifdef TEST_TEXTSTREAM
TestTextInputStream();
#endif // TEST_TEXTSTREAM
#ifdef TEST_TIMER
TestStopWatch();
TestTimer();

22
tests/streams/textstreamtest.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: tests/uris/uris.cpp
// Name: tests/streams/textstreamtest.cpp
// Purpose: wxTextXXXStream unit test
// Author: Ryan Norton, Vince Harron
// Created: 2004-08-14
@@ -44,6 +44,7 @@ public:
private:
CPPUNIT_TEST_SUITE( TextStreamTestCase );
CPPUNIT_TEST( Endline );
CPPUNIT_TEST( MiscTests );
#if wxUSE_LONGLONG
CPPUNIT_TEST( TestLongLong );
@@ -60,6 +61,7 @@ private:
CPPUNIT_TEST_SUITE_END();
void Endline();
void MiscTests();
#if wxUSE_LONGLONG
void TestLongLong();
@@ -123,6 +125,24 @@ void TextStreamTestCase::Endline()
delete pInFile;
}
void TextStreamTestCase::MiscTests()
{
wxString filename = wxT("testdata.fc");
wxFileInputStream fsIn(filename);
if ( !fsIn.Ok() )
{
return;
}
wxTextInputStream tis(fsIn);
CPPUNIT_ASSERT_EQUAL("# this is the test data file for wxFileConfig tests", tis.ReadLine());
CPPUNIT_ASSERT_EQUAL("value1=one", tis.ReadLine());
CPPUNIT_ASSERT_EQUAL("# a comment here", tis.ReadLine());
CPPUNIT_ASSERT_EQUAL("value2=two", tis.ReadLine());
CPPUNIT_ASSERT_EQUAL("value\\ with\\ spaces\\ inside\\ it=nothing special", tis.ReadLine());
CPPUNIT_ASSERT_EQUAL("path=$PATH", tis.ReadLine());
}
#if wxUSE_LONGLONG
template <typename T>