Additional tests for wxVsnprintf, originally to test the copy from the scratch,

[wxWidgets.git] / tests / filename / filenametest.cpp

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 8a8f6842f2a6b58e18a88d6d36d5c9933f8738de..889b28262c6e7a1d66a5ce601df9d5bfa948768b 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -24,6 +24,16 @@
 #include "wx/filename.h"
 #include "wx/filefn.h"
 
 #include "wx/filename.h"
 #include "wx/filefn.h"
 

+// ----------------------------------------------------------------------------
+// local functions
+// ----------------------------------------------------------------------------
+
+// define stream inserter for wxFileName to use it in CPPUNIT_ASSERT_EQUAL()
+inline std::ostream& operator<<(std::ostream& o, const wxFileName& fn)
+{
+    return o << fn.GetFullPath();
+}
+

 // ----------------------------------------------------------------------------
 // test data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // test data
 // ----------------------------------------------------------------------------


@@ -132,9 +142,16 @@ void FileNameTestCase::TestConstruction()
         wxFileName fn(fni.fullname, fni.format);
 
         wxString fullname = fn.GetFullPath(fni.format);
         wxFileName fn(fni.fullname, fni.format);
 
         wxString fullname = fn.GetFullPath(fni.format);

-        CPPUNIT_ASSERT( fullname == fni.fullname );
+        CPPUNIT_ASSERT_EQUAL( wxString(fni.fullname), fullname );

 
 

-        CPPUNIT_ASSERT( fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) );
+        // notice that we use a dummy working directory to ensure that paths
+        // with "../.." in them could be normalized, otherwise this would fail
+        // if the test is run from root directory or its direct subdirectory
+        CPPUNIT_ASSERT_MESSAGE
+        (
+            wxString::Format("Normalize(%s) failed", fni.fullname).c_str(),
+            fn.Normalize(wxPATH_NORM_ALL, _T("/foo/bar/baz"), fni.format)
+        );

 
         if ( *fni.volume && *fni.path )
         {
 
         if ( *fni.volume && *fni.path )
         {


@@ -144,10 +161,10 @@ void FileNameTestCase::TestConstruction()
             pathWithVolume += wxFileName::GetVolumeSeparator(fni.format);
             pathWithVolume += fni.path;
 
             pathWithVolume += wxFileName::GetVolumeSeparator(fni.format);
             pathWithVolume += fni.path;
 

-            CPPUNIT_ASSERT( fn == wxFileName(pathWithVolume,
+            CPPUNIT_ASSERT_EQUAL( wxFileName(pathWithVolume,

                                              fni.name,
                                              fni.ext,
                                              fni.name,
                                              fni.ext,

-                                             fni.format) );
+                                             fni.format), fn );

         }
     }
 }
         }
     }
 }


@@ -158,7 +175,7 @@ void FileNameTestCase::TestComparison()
     wxFileName fn2(wxT("/tmp/dir2/../file2"));
     fn1.Normalize();
     fn2.Normalize();
     wxFileName fn2(wxT("/tmp/dir2/../file2"));
     fn1.Normalize();
     fn2.Normalize();

-    CPPUNIT_ASSERT(fn1.GetPath() == fn2.GetPath());
+    CPPUNIT_ASSERT_EQUAL(fn1.GetPath(), fn2.GetPath());

 }
 
 void FileNameTestCase::TestSplit()
 }
 
 void FileNameTestCase::TestSplit()


@@ -170,15 +187,15 @@ void FileNameTestCase::TestSplit()
         wxFileName::SplitPath(fni.fullname,
                               &volume, &path, &name, &ext, fni.format);
 
         wxFileName::SplitPath(fni.fullname,
                               &volume, &path, &name, &ext, fni.format);
 

-        CPPUNIT_ASSERT( volume == fni.volume );
-        CPPUNIT_ASSERT( path == fni.path );
-        CPPUNIT_ASSERT( name == fni.name );
-        CPPUNIT_ASSERT( ext == fni.ext );
+        CPPUNIT_ASSERT_EQUAL( wxString(fni.volume), volume );
+        CPPUNIT_ASSERT_EQUAL( wxString(fni.path), path );
+        CPPUNIT_ASSERT_EQUAL( wxString(fni.name), name );
+        CPPUNIT_ASSERT_EQUAL( wxString(fni.ext), ext );

     }
 
     // special case of empty extension
     wxFileName fn(_T("foo."));
     }
 
     // special case of empty extension
     wxFileName fn(_T("foo."));

-    CPPUNIT_ASSERT( fn.GetFullPath() == _T("foo.") );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("foo.")), fn.GetFullPath() );

 }
 
 void FileNameTestCase::TestSetPath()
 }
 
 void FileNameTestCase::TestSetPath()


@@ -215,7 +232,7 @@ void FileNameTestCase::TestNormalize()
 
     static struct FileNameTest
     {
 
     static struct FileNameTest
     {

-        wxString original;
+        const wxChar *original;

         int flags;
         wxString expected;
     } tests[] =
         int flags;
         wxString expected;
     } tests[] =


@@ -250,12 +267,16 @@ void FileNameTestCase::TestNormalize()
     // set the env var ABCDEF
     wxSetEnv(_T("ABCDEF"), _T("abcdef"));
 
     // set the env var ABCDEF
     wxSetEnv(_T("ABCDEF"), _T("abcdef"));
 

-    for (size_t i=0; i < WXSIZEOF(tests); i++)
+    for ( size_t i = 0; i < WXSIZEOF(tests); i++ )

     {
         wxFileName fn(tests[i].original, wxPATH_UNIX);
 
         // be sure this normalization does not fail
     {
         wxFileName fn(tests[i].original, wxPATH_UNIX);
 
         // be sure this normalization does not fail

-        CPPUNIT_ASSERT( fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX) );
+        CPPUNIT_ASSERT_MESSAGE
+        (
+            wxString::Format("Normalize(%s) failed", tests[i].original).c_str(),
+            fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX)
+        );

 
         // compare result with expected string
         CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );
 
         // compare result with expected string
         CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );


@@ -271,13 +292,13 @@ wxString wxTestStripExtension(wxString szFile)
 void FileNameTestCase::TestStrip()
 {
     //test a crash
 void FileNameTestCase::TestStrip()
 {
     //test a crash

-    CPPUNIT_ASSERT( wxTestStripExtension( _T("") ) == _T("") );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T("")) );

 
     //others
 
     //others

-    CPPUNIT_ASSERT( wxTestStripExtension( _T(".") ) == _T("") );
-    CPPUNIT_ASSERT( wxTestStripExtension( _T(".wav") ) == _T("") );
-    CPPUNIT_ASSERT( wxTestStripExtension( _T("good.wav") ) == _T("good") );
-    CPPUNIT_ASSERT( wxTestStripExtension( _T("good.wav.wav") ) == _T("good.wav") );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".")) );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".wav")) );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("good")), wxTestStripExtension(_T("good.wav")) );
+    CPPUNIT_ASSERT_EQUAL( wxString(_T("good.wav")), wxTestStripExtension(_T("good.wav.wav")) );

 }
 
 #ifdef __WINDOWS__
 }
 
 #ifdef __WINDOWS__