Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / tests / streams / textstreamtest.cpp

diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp
index 4580a88a348c5ac34bcede637c2e7d8ae799d641..aa089980fd29441dd9642b4e424af4aedaaf7096 100644 (file)
--- a/tests/streams/textstreamtest.cpp
+++ b/tests/streams/textstreamtest.cpp
@@ -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
 // 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 );
 private:
     CPPUNIT_TEST_SUITE( TextStreamTestCase );
         CPPUNIT_TEST( Endline );

+        CPPUNIT_TEST( MiscTests );

 
 #if wxUSE_LONGLONG
         CPPUNIT_TEST( TestLongLong );
 
 #if wxUSE_LONGLONG
         CPPUNIT_TEST( TestLongLong );


@@ -60,6 +61,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 
     void Endline();
     CPPUNIT_TEST_SUITE_END();
 
     void Endline();

+    void MiscTests();

 
 #if wxUSE_LONGLONG
     void TestLongLong();
 
 #if wxUSE_LONGLONG
     void TestLongLong();


@@ -84,14 +86,14 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( TextStreamTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( TextStreamTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TextStreamTestCase, "TextStreamTestCase" );
 
 TextStreamTestCase::TextStreamTestCase()
 {
 }
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TextStreamTestCase, "TextStreamTestCase" );
 
 TextStreamTestCase::TextStreamTestCase()
 {
 }
 

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)

 #   define NEWLINE "\r\n"
 #   define NEWLINELEN 2
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
 #   define NEWLINE "\r\n"
 #   define NEWLINELEN 2
 #elif defined(__WXMAC__) && !defined(__DARWIN__)


@@ -123,6 +125,24 @@ void TextStreamTestCase::Endline()
     delete pInFile;
 }
 
     delete pInFile;
 }
 

+void TextStreamTestCase::MiscTests()
+{
+    wxString filename = wxT("testdata.fc");
+    wxFileInputStream fsIn(filename);
+    if ( !fsIn.IsOk() )
+    {
+        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>
 #if wxUSE_LONGLONG
 
 template <typename T>