# HG changeset patch # User jodogne # Date 1368018973 -7200 # Node ID f746592d8301be7c1390444342b47301526278eb # Parent 09b3c6265a94ed241de4800bdad8030a7ca21dd8 unit testing diff -r 09b3c6265a94 -r f746592d8301 OrthancServer/OrthancInitialization.cpp --- a/OrthancServer/OrthancInitialization.cpp Wed May 08 15:13:01 2013 +0200 +++ b/OrthancServer/OrthancInitialization.cpp Wed May 08 15:16:13 2013 +0200 @@ -286,8 +286,6 @@ boost::filesystem::path base(baseDirectory); boost::filesystem::path relative(relativePath); - return (base / relative).string(); - /** The following lines should be equivalent to this one: diff -r 09b3c6265a94 -r f746592d8301 UnitTests/main.cpp --- a/UnitTests/main.cpp Wed May 08 15:13:01 2013 +0200 +++ b/UnitTests/main.cpp Wed May 08 15:16:13 2013 +0200 @@ -338,7 +338,8 @@ #if defined(__linux) TEST(OrthancInitialization, AbsoluteDirectory) { - ASSERT_EQ("/tmp/coucou", InterpretRelativePath("/tmp", "coucou")); + ASSERT_EQ("/tmp/hello", InterpretRelativePath("/tmp", "hello")); + ASSERT_EQ("/tmp", InterpretRelativePath("/tmp", "/tmp")); } #endif