Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxFileName unit test under Unix after recent changes

Browse Source 
Don't use GetVolumeSeparator() to combine UNC or GUID volumes with
paths, this doesn't work because this kind of paths doesn't contain
colons at all.

Update the documentation to mention this.
This commit is contained in:
Vadim Zeitlin
2021-09-15 13:10:25 +02:00
parent e8629db48a
commit ed19e5625b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/wx/filename.h
View File

@@ -877,6 +877,14 @@ public:
/** /**
Returns the string separating the volume from the path for this format. Returns the string separating the volume from the path for this format.
Note that for @c wxPATH_DOS paths this string can only be used for
single-character volumes representing the drive letters, but not with
the UNC or GUID volumes (see their description in GetVolume()
documentation). For this reason, its use should be avoided, prefer
using wxFileName constructor and Assign() overload taking the volume
and the path as separate arguments to combining the volume and the path
into a single string using the volume separator between them.
*/ */
static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE); static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE);

4
tests/filename/filenametest.cpp
View File

@@ -169,7 +169,9 @@ TEST_CASE("wxFileName::Construction", "[filename]")
// if the test is run from root directory or its direct subdirectory // if the test is run from root directory or its direct subdirectory
CHECK( fn.Normalize(wxPATH_NORM_ALL, "/foo/bar/baz", fni.format) ); CHECK( fn.Normalize(wxPATH_NORM_ALL, "/foo/bar/baz", fni.format) );
if ( *fni.volume && *fni.path ) // restrict this check to drive letter volumes as UNC and GUID volumes
// can't be combined with the path using the volume separator
if ( strlen(fni.volume) == 1 && *fni.path )
{ {
// check that specifying the volume separately or as part of the // check that specifying the volume separately or as part of the
// path doesn't make any difference // path doesn't make any difference