added \\server\dir\filename.exe test case

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 5a8015c7857113d4192083a2da46b2737232ccb1..f312f1c51ddf67c6801260f7c8085dfdb565994f 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -91,7 +91,7 @@
     #undef TEST_ALL
     static const bool TEST_ALL = TRUE;
 #else
     #undef TEST_ALL
     static const bool TEST_ALL = TRUE;
 #else

-    #define TEST_DIR
+    #define TEST_FILENAME

 
     static const bool TEST_ALL = FALSE;
 #endif
 
     static const bool TEST_ALL = FALSE;
 #endif


@@ -866,6 +866,7 @@ static struct FileNameInfo
     { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
     { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), TRUE, wxPATH_DOS },
     { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
     { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
     { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), TRUE, wxPATH_DOS },
     { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },

+    { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },

 
     // wxFileName support for Mac file names is broken currently
 #if 0
 
     // wxFileName support for Mac file names is broken currently
 #if 0


@@ -5896,7 +5897,7 @@ int main(int argc, char **argv)
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME

-    if ( 1 )
+    if ( 0 )

     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");


@@ -5905,6 +5906,7 @@ int main(int argc, char **argv)
         DumpFileName(fn);
     }
 
         DumpFileName(fn);
     }
 

+    TestFileNameConstruction();

     if ( TEST_ALL )
     {
         TestFileNameConstruction();
     if ( TEST_ALL )
     {
         TestFileNameConstruction();