Fixes #22 issue with folder to folder relative path (#24)

Open-Systems-Pharmacology · Feb 27, 2019 · 6a9b4e7 · 6a9b4e7
1 parent 6ef9d67
commit 6a9b4e7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/src/OSPSuite.Utility/FileHelper.cs b/src/OSPSuite.Utility/FileHelper.cs
@@ -329,25 +329,25 @@ public static string CreateRelativePath(string originalPath, string relativeToPa
 
       private static string sanitizePath(string path, bool isRelativeToPath)
       {
-         var endsWithSeparator = path.EndsWith(Path.DirectorySeparatorChar.ToString());
+         var sanitizedPath = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+         var endsWithSeparator = sanitizedPath.EndsWith(Path.DirectorySeparatorChar.ToString());
 
          //The relative path should always end with a separator
          if (isRelativeToPath)
-         {
-            if (endsWithSeparator)
-               return path;
-
-            return appendDirectorySeparator(path);
-         }
+            return appendDirectorySeparator(sanitizedPath);
 
          //Absolute argument should not end with separator
          if (endsWithSeparator)
-            return path.Remove(path.Length - 1);
+            return sanitizedPath.Remove(sanitizedPath.Length - 1);
 
-         return path;
+         return sanitizedPath;
       }
 
-      private static string appendDirectorySeparator(string path) => $"{path}{Path.DirectorySeparatorChar}";
+      private static string appendDirectorySeparator(string path)
+      {
+         var endsWithSeparator = path.EndsWith(Path.DirectorySeparatorChar.ToString());
+         return endsWithSeparator ? path : $"{path}{Path.DirectorySeparatorChar}";
+      }
 
       /// <summary>
       ///    Try to shorten a path to a given max length (e.g. replace the sub folder with ...)

diff --git a/tests/OSPSuite.Utility.Tests/FileHelperSpecs.cs b/tests/OSPSuite.Utility.Tests/FileHelperSpecs.cs
@@ -261,6 +261,25 @@ public void should_return_the_expected_relative_path_between_a_folder_and_a_fold
          FileHelper.CreateRelativePath("c:/A/B/C/D", "c:/A/B").ShouldBeEqualTo(@"C\D\");
       }
 
+      [Observation]
+      public void should_return_the_expected_relative_path_between_a_folder_and_a_folder_ending_with_a_folder_char()
+      {
+         FileHelper.CreateRelativePath("c:/A/B/C/D", "c:/A/B/").ShouldBeEqualTo(@"C\D\");
+      }
+
+      [Observation]
+      public void should_return_the_expected_relative_path_between_a_folder_ending_with_a_folder_char_and_a_folder()
+      {
+         FileHelper.CreateRelativePath("c:/A/B/C/D/", "c:/A/B").ShouldBeEqualTo(@"C\D\");
+      }
+
+      [Observation]
+      public void should_return_the_expected_relative_path_between_a_folder_ending_with_a_folder_char_and_a_folder_ending_with_a_folder_char()
+      {
+         FileHelper.CreateRelativePath("c:/A/B/C/D/", "c:/A/B/").ShouldBeEqualTo(@"C\D\");
+      }
+
+
       [Observation]
       public void should_return_the_expected_relative_path_between_a_folder_and_a_file()
       {