X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50db84779471824160c5701a72ad4db9b35c2f2..968b44d37b9fcdc5232fb68312a65e4fc6b5f4ab:/tests/filename/filenametest.cpp

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 510cc64248..10ef920f39 100644
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -673,16 +673,33 @@ void FileNameTestCase::TestExists()
     CPPUNIT_ASSERT( fn.FileExists() );
     CPPUNIT_ASSERT( !wxFileName::DirExists(fn.GetFullPath()) );
 
+    // FIXME-VC6: This compiler crashes with
+    //
+    //      fatal error C1001: INTERNAL COMPILER ERROR
+    //      (compiler file 'msc1.cpp', line 1794)
+    //
+    // when compiling calls to Exists() with parameter for some reason, just
+    // disable these tests there.
+#ifndef __VISUALC6__
     CPPUNIT_ASSERT( fn.Exists(wxFILE_EXISTS_REGULAR) );
     CPPUNIT_ASSERT( !fn.Exists(wxFILE_EXISTS_DIR) );
+#endif
     CPPUNIT_ASSERT( fn.Exists() );
 
-    wxFileName dirTemp(wxFileName::DirName(wxFileName::GetTempDir()));
+    const wxString& tempdir = wxFileName::GetTempDir();
+
+    wxFileName fileInTempDir(tempdir, "bloordyblop");
+    CPPUNIT_ASSERT( !fileInTempDir.Exists() );
+    CPPUNIT_ASSERT( fileInTempDir.DirExists() );
+
+    wxFileName dirTemp(wxFileName::DirName(tempdir));
     CPPUNIT_ASSERT( !dirTemp.FileExists() );
     CPPUNIT_ASSERT( dirTemp.DirExists() );
 
+#ifndef __VISUALC6__
     CPPUNIT_ASSERT( dirTemp.Exists(wxFILE_EXISTS_DIR) );
     CPPUNIT_ASSERT( !dirTemp.Exists(wxFILE_EXISTS_REGULAR) );
+#endif
     CPPUNIT_ASSERT( dirTemp.Exists() );
 
 #ifdef __UNIX__
@@ -692,18 +709,19 @@ void FileNameTestCase::TestExists()
     CPPUNIT_ASSERT( wxFileName::Exists("/dev/null", wxFILE_EXISTS_DEVICE) );
 #ifdef __LINUX__
     // These files are only guaranteed to exist under Linux.
-    CPPUNIT_ASSERT( !wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) );
-    CPPUNIT_ASSERT( wxFileName::Exists("/dev/core",
-                    wxFILE_EXISTS_SYMLINK | wxFILE_EXISTS_NO_FOLLOW) );
+    // No need for wxFILE_EXISTS_NO_FOLLOW here; wxFILE_EXISTS_SYMLINK implies it
+    CPPUNIT_ASSERT( wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) );
     CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) );
 #endif // __LINUX__
+#ifndef __VMS
     wxString fifo = dirTemp.GetPath() + "/fifo";
-    if (mkfifo(fifo, 0600) == 0)
+   if (mkfifo(fifo.c_str(), 0600) == 0)
     {
         wxON_BLOCK_EXIT1(wxRemoveFile, fifo);
 
         CPPUNIT_ASSERT( wxFileName::Exists(fifo, wxFILE_EXISTS_FIFO) );
     }
+#endif
 #endif // __UNIX__
 }
 
@@ -768,9 +786,15 @@ void FileNameTestCase::TestSymlinks()
     CPPUNIT_ASSERT(tmpfn.GetTimes(&dtAccessTmp, &dtModTmp, &dtCreateTmp));
 
     // Create a temporary directory
+#ifdef __VMS
+    wxString name = tmpdir + ".filenametestXXXXXX]";
+    mkdir( name.char_str() , 0222 );
+    wxString tempdir = name;
+#else
     wxString name = tmpdir + "/filenametestXXXXXX";
     wxString tempdir = wxString::From8BitData(mkdtemp(name.char_str()));
     tempdir << wxFileName::GetPathSeparator();
+#endif
     wxFileName tempdirfn(wxFileName::DirName(tempdir));
     CPPUNIT_ASSERT(tempdirfn.DirExists());
 
@@ -778,11 +802,12 @@ void FileNameTestCase::TestSymlinks()
     wxFileName targetfn(wxFileName::CreateTempFileName(tempdir));
     CPPUNIT_ASSERT(targetfn.FileExists());
 
-    // Create a symlink to that file, and another to the home dir
+    // Create a symlink to that file
     wxFileName linktofile(tempdir, "linktofile");
     CPPUNIT_ASSERT_EQUAL(0, symlink(targetfn.GetFullPath().c_str(),
                                         linktofile.GetFullPath().c_str()));
 
+    // ... and another to the temporary directory
     const wxString linktodirName(tempdir + "/linktodir");
     wxFileName linktodir(wxFileName::DirName(linktodirName));
     CPPUNIT_ASSERT_EQUAL(0, symlink(tmpfn.GetFullPath().c_str(),
@@ -916,11 +941,31 @@ void FileNameTestCase::TestSymlinks()
 
     // Finally test Exists() after removing the file.
     CPPUNIT_ASSERT(wxRemoveFile(targetfn.GetFullPath()));
-    CPPUNIT_ASSERT(!wxFileName(tempdir, "linktofile").Exists());
+    // This should succeed, as the symlink still exists and
+    // the default wxFILE_EXISTS_ANY implies wxFILE_EXISTS_NO_FOLLOW
+    CPPUNIT_ASSERT(wxFileName(tempdir, "linktofile").Exists());
+    // So should this one, as wxFILE_EXISTS_SYMLINK does too
+    CPPUNIT_ASSERT(wxFileName(tempdir, "linktofile").
+                                            Exists(wxFILE_EXISTS_SYMLINK));
+    // but not this one, as the now broken symlink is followed
+    CPPUNIT_ASSERT(!wxFileName(tempdir, "linktofile").
+                                            Exists(wxFILE_EXISTS_REGULAR));
     CPPUNIT_ASSERT(linktofile.Exists());
 
-    // Clean-up, and also tests removal of a dir containing a symlink-to-dir
+    // This is also a convenient place to test Rmdir() as we have things to
+    // remove.
+
+    // First, check that removing a symlink to a directory fails.
+    CPPUNIT_ASSERT( !wxFileName::Rmdir(linktodirName) );
+
+    // And recursively removing it only removes the symlink itself, not the
+    // directory.
+    CPPUNIT_ASSERT( wxFileName::Rmdir(linktodirName, wxPATH_RMDIR_RECURSIVE) );
+    CPPUNIT_ASSERT( tmpfn.Exists() );
+
+    // Finally removing the directory itself does remove everything.
     CPPUNIT_ASSERT(tempdirfn.Rmdir(wxPATH_RMDIR_RECURSIVE));
+    CPPUNIT_ASSERT( !tempdirfn.Exists() );
 }
 
 #endif // __UNIX__