Skip to content
Snippets Groups Projects
Commit f63f4129 authored by Christoph Lehmann's avatar Christoph Lehmann
Browse files

[T] changed joinPaths

parent 4104e5b1
No related branches found
No related tags found
No related merge requests found
...@@ -391,12 +391,13 @@ TEST(BaseLib, ExtractPathUnix) ...@@ -391,12 +391,13 @@ TEST(BaseLib, ExtractPathUnix)
TEST(BaseLib, JoinPaths) TEST(BaseLib, JoinPaths)
{ {
#if _WIN32 #if _WIN32
ASSERT_EQ ( "\\path\\path", BaseLib::joinPaths("\\path", "path") );
ASSERT_EQ ( "\\path\\path", BaseLib::joinPaths("\\path", "\\path") ); ASSERT_EQ ( "\\path\\path", BaseLib::joinPaths("\\path", "\\path") );
ASSERT_EQ ( "\\path\\path", BaseLib::joinPaths("\\path", ".\\path") ); ASSERT_EQ ( "\\path\\path", BaseLib::joinPaths("\\path\\", "\\path") );
ASSERT_EQ ( "\\path\\.\\path", BaseLib::joinPaths("\\path", ".\\path") );
#else #else
ASSERT_EQ ( "/path/path", BaseLib::joinPaths("/path", "path") );
ASSERT_EQ ( "/path/path", BaseLib::joinPaths("/path", "/path") ); ASSERT_EQ ( "/path/path", BaseLib::joinPaths("/path", "/path") );
ASSERT_EQ ( "/path/path", BaseLib::joinPaths("/path", "./path") ); ASSERT_EQ ( "/path/path", BaseLib::joinPaths("/path/", "/path") );
ASSERT_EQ ( "/path/./path", BaseLib::joinPaths("/path", "./path") );
ASSERT_EQ ( "/path", BaseLib::joinPaths("/", "path") );
#endif #endif
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment