From 1490ff1eacb7784ca25818f2ed528ffa8debf8e2 Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Fri, 14 Jun 2024 08:42:08 +0200 Subject: [PATCH] [T] Adapted path unit test --- Tests/BaseLib/TestFilePathStringManipulation.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp index d790059ad57..fa61ed4b39e 100644 --- a/Tests/BaseLib/TestFilePathStringManipulation.cpp +++ b/Tests/BaseLib/TestFilePathStringManipulation.cpp @@ -16,27 +16,29 @@ TEST(BaseLib, CopyPathToFileNameWin) { ASSERT_EQ("extend\\file", BaseLib::copyPathToFileName("file", "extend")); - ASSERT_EQ("path\\file", + ASSERT_EQ("extend\\path\\file", BaseLib::copyPathToFileName("path\\file", "extend")); ASSERT_EQ("extend\\file", BaseLib::copyPathToFileName("file", "extend\\")); - ASSERT_EQ("path\\file", + ASSERT_EQ("extend\\path\\file", BaseLib::copyPathToFileName("path\\file", "extend\\")); ASSERT_EQ("extend\\smth\\file", BaseLib::copyPathToFileName("file", "extend\\smth")); - ASSERT_EQ("path\\file", + ASSERT_EQ("extend\\smth\\path\\file", BaseLib::copyPathToFileName("path\\file", "extend\\smth")); } #else TEST(BaseLib, CopyPathToFileNameUnix) { ASSERT_EQ("extend/file", BaseLib::copyPathToFileName("file", "extend")); - ASSERT_EQ("path/file", BaseLib::copyPathToFileName("path/file", "extend")); + ASSERT_EQ("extend/path/file", + BaseLib::copyPathToFileName("path/file", "extend")); ASSERT_EQ("extend/file", BaseLib::copyPathToFileName("file", "extend/")); - ASSERT_EQ("path/file", BaseLib::copyPathToFileName("path/file", "extend/")); + ASSERT_EQ("extend/path/file", + BaseLib::copyPathToFileName("path/file", "extend/")); ASSERT_EQ("extend/smth/file", BaseLib::copyPathToFileName("file", "extend/smth")); - ASSERT_EQ("path/file", + ASSERT_EQ("extend/smth/path/file", BaseLib::copyPathToFileName("path/file", "extend/smth")); } #endif -- GitLab