Don't return a dangling pointer from wxDateTime::ParseXXX(wxCStrData).

[wxWidgets.git] / tests / textfile / textfiletest.cpp

diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index 8b5717082f99b8a93836a151c8b7624f1a568ec9..1e1184b413e573205e9b5d36505fbb0439755b5b 100644 (file)
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -25,6 +25,10 @@
 #include "wx/ffile.h"
 #include "wx/textfile.h"
 
+#ifdef __VISUALC__
+    #define unlink _unlink
+#endif
+
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -81,7 +85,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( TextFileTestCase );
 
-// 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( TextFileTestCase, "TextFileTestCase" );
 
 void TextFileTestCase::CreateTestFile(size_t len, const char *contents)
@@ -89,8 +93,8 @@ void TextFileTestCase::CreateTestFile(size_t len, const char *contents)
     FILE *f = fopen(GetTestFileName(), "wb");
     CPPUNIT_ASSERT( f );
 
-    CPPUNIT_ASSERT( fwrite(contents, 1, len, f) >= 0 );
-    CPPUNIT_ASSERT( fclose(f) == 0 );
+    CPPUNIT_ASSERT_EQUAL( len, fwrite(contents, 1, len, f) );
+    CPPUNIT_ASSERT_EQUAL( 0, fclose(f) );
 }
 
 void TextFileTestCase::ReadEmpty()
@@ -113,8 +117,8 @@ void TextFileTestCase::ReadDOS()
     CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
 }
 
 void TextFileTestCase::ReadUnix()
@@ -127,8 +131,8 @@ void TextFileTestCase::ReadUnix()
     CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
 }
 
 void TextFileTestCase::ReadMac()
@@ -141,8 +145,8 @@ void TextFileTestCase::ReadMac()
     CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
 }
 
 void TextFileTestCase::ReadMixed()
@@ -156,9 +160,9 @@ void TextFileTestCase::ReadMixed()
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("foo")), f.GetFirstLine() );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
-    CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("foo")), f.GetFirstLine() );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
+    CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
 }
 
 #if wxUSE_UNICODE
@@ -202,6 +206,8 @@ void TextFileTestCase::ReadUTF16()
 #endif // wxHAVE_U_ESCAPE
 }
 
+#endif // wxUSE_UNICODE
+
 void TextFileTestCase::ReadBig()
 {
     static const size_t NUM_LINES = 10000;
@@ -225,7 +231,5 @@ void TextFileTestCase::ReadBig()
                           f[NUM_LINES - 1] );
 }
 
-#endif // wxUSE_UNICODE
-
 #endif // wxUSE_TEXTFILE