Remove Code Smell

maurosoft1973 · Sep 14, 2023 · 81a5493 · 81a5493
1 parent d0a3e72
commit 81a5493
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 66 deletions.
diff --git a/src/FileSystem/src/Adapters/Adapter.cs b/src/FileSystem/src/Adapters/Adapter.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using Maurosoft.FileSystem.Models;
 using Serilog;
-using Serilog.Core;
 using DirectoryNotFoundException = Maurosoft.FileSystem.Exceptions.DirectoryNotFoundException;
 using FileNotFoundException = Maurosoft.FileSystem.Exceptions.FileNotFoundException;
 
@@ -297,7 +296,15 @@ public void WriteFile(string path, string contents, bool overwrite = false)
 
         protected string[] GetPathParts(string path) => path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
 
-        protected string GetLastPathPart(string path) => GetPathParts(path).Length > 0 ? GetPathParts(path).Last() : String.Empty;
+        protected string GetLastPathPart(string path)
+        {
+            var pathParts = GetPathParts(path);
+
+            if (pathParts.Length > 0)
+                return pathParts[pathParts.Length - 1];
+            else
+                return String.Empty;
+        }
 
         protected string GetParentPathPart(string path)
         {

diff --git a/tests/FileSystem.Tests/FileSystem.Adapters.Ftp/FtpFixture.cs b/tests/FileSystem.Tests/FileSystem.Adapters.Ftp/FtpFixture.cs
@@ -39,11 +39,9 @@ public FtpFixture()
         if (Environment.GetEnvironmentVariable("DOCKER_HOST") == null)
             Environment.SetEnvironmentVariable("DOCKER_HOST", "unix:///var/run/docker.sock");
 
-        userName = faker.Internet.UserName();
+        userName = faker.Random.String2(10, 15);
         password = faker.Internet.Password();
 
-        userName = Regex.Replace(userName, @"[^a-zA-Z0-9_]+", "");
-
         var passivePortEnd = PassivePortStart + (MaxUsersCount);
 
         var containerBuilder = new ContainerBuilder()

diff --git a/tests/FileSystem.Tests/FileSystem.Adapters.Sftp/SftpFixture.cs b/tests/FileSystem.Tests/FileSystem.Adapters.Sftp/SftpFixture.cs
@@ -35,11 +35,9 @@ public SftpFixture()
         if (Environment.GetEnvironmentVariable("DOCKER_HOST") == null)
             Environment.SetEnvironmentVariable("DOCKER_HOST", "unix:///var/run/docker.sock");
 
-        userName = faker.Internet.UserName();
+        userName = faker.Random.String2(10, 15);
         password = faker.Internet.Password();
 
-        userName = Regex.Replace(userName, @"[^a-zA-Z0-9_]+", "");
-
         var containerBuilder = new ContainerBuilder()
             .WithName(Guid.NewGuid().ToString("D"))
             .WithAutoRemove(autoRemove: false)

diff --git a/tests/FileSystem.Tests/PriorityOrderer.cs b/tests/FileSystem.Tests/PriorityOrderer.cs
diff --git a/tests/FileSystem.Tests/TestPriorityAttribute.cs b/tests/FileSystem.Tests/TestPriorityAttribute.cs