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

Fix recently added wxFileName::MakeRelativeTo() unit test for non-Unix.

Browse Source 
Don't hard code the use of slashes as path separators.
This commit is contained in:
Vadim Zeitlin
2015-05-30 03:38:03 +02:00
parent 6dfd6f4930
commit ef30f6fe63
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/filename/filenametest.cpp
View File

@@ -445,17 +445,20 @@ void FileNameTestCase::TestNormalize()
void FileNameTestCase::TestRelative() void FileNameTestCase::TestRelative()
{ {
wxFileName fn("a/b.cpp"); const wxString pathSep = wxFileName::GetPathSeparator();
wxFileName fn("a" + pathSep + "b.cpp");
fn.MakeRelativeTo("a"); fn.MakeRelativeTo("a");
CPPUNIT_ASSERT_EQUAL( "b.cpp", fn.GetFullPath() ); CPPUNIT_ASSERT_EQUAL( "b.cpp", fn.GetFullPath() );
fn.AssignDir("a/b"); fn.AssignDir("a" + pathSep + "b");
fn.MakeRelativeTo("a"); fn.MakeRelativeTo("a");
CPPUNIT_ASSERT_EQUAL( "b/", fn.GetFullPath() );
CPPUNIT_ASSERT_EQUAL( "b" + pathSep, fn.GetFullPath() );
fn.AssignDir("a"); fn.AssignDir("a");
fn.MakeRelativeTo("a"); fn.MakeRelativeTo("a");
CPPUNIT_ASSERT_EQUAL( "./", fn.GetFullPath() ); CPPUNIT_ASSERT_EQUAL( "." + pathSep, fn.GetFullPath() );
} }
void FileNameTestCase::TestReplace() void FileNameTestCase::TestReplace()