improve sftp adapter unit tests

mvdgun · mvdgun · commit d6f49d35faa7 · 2023-10-24T22:06:27.000-04:00
diff --git a/FileSystem.Adapters.AmazonS3/FileSystem.Adapters.AmazonS3.csproj b/FileSystem.Adapters.AmazonS3/FileSystem.Adapters.AmazonS3.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AWSSDK.S3" Version="3.7.201.2" />
+        <PackageReference Include="AWSSDK.S3" Version="3.7.205.17" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FileSystem.Adapters.AzureBlobStorage/FileSystem.Adapters.AzureBlobStorage.csproj b/FileSystem.Adapters.AzureBlobStorage/FileSystem.Adapters.AzureBlobStorage.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FileSystem.Adapters.AzureFileStorage/FileSystem.Adapters.AzureFileStorage.csproj b/FileSystem.Adapters.AzureFileStorage/FileSystem.Adapters.AzureFileStorage.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Azure.Storage.Files.Shares" Version="12.15.0" />
+        <PackageReference Include="Azure.Storage.Files.Shares" Version="12.16.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FileSystem.Adapters.MicrosoftOneDrive/FileSystem.Adapters.MicrosoftOneDrive.csproj b/FileSystem.Adapters.MicrosoftOneDrive/FileSystem.Adapters.MicrosoftOneDrive.csproj
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Graph" Version="4.54.0" />
-        <PackageReference Include="Microsoft.Identity.Client" Version="4.55.0" />
+        <PackageReference Include="Microsoft.Identity.Client" Version="4.57.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FileSystem.Adapters.Sftp/FileSystem.Adapters.Sftp.csproj b/FileSystem.Adapters.Sftp/FileSystem.Adapters.Sftp.csproj
@@ -21,7 +21,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SSH.NET" Version="2020.0.2" />
+        <PackageReference Include="SSH.NET" Version="2023.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/FileSystem.Adapters.Sftp/src/ModelFactory.cs b/FileSystem.Adapters.Sftp/src/ModelFactory.cs
@@ -5,7 +5,7 @@ namespace SharpGrip.FileSystem.Adapters.Sftp
 {
     public static class ModelFactory
     {
-        public static IFile CreateFile(SftpFile file, string virtualPath)
+        public static IFile CreateFile(ISftpFile file, string virtualPath)
         {
             return new FileModel
             {
@@ -17,7 +17,7 @@ public static IFile CreateFile(SftpFile file, string virtualPath)
             };
         }
 
-        public static DirectoryModel CreateDirectory(SftpFile directory, string virtualPath)
+        public static DirectoryModel CreateDirectory(ISftpFile directory, string virtualPath)
         {
             return new DirectoryModel
             {
diff --git a/FileSystem.Adapters.Sftp/src/SftpAdapter.cs b/FileSystem.Adapters.Sftp/src/SftpAdapter.cs
@@ -18,16 +18,16 @@ namespace SharpGrip.FileSystem.Adapters.Sftp
 {
     public class SftpAdapter : Adapter<SftpAdapterConfiguration, string, string>
     {
-        private readonly SftpClient client;
+        private readonly ISftpClient client;
 
-        public SftpAdapter(string prefix, string rootPath, SftpClient client, Action<SftpAdapterConfiguration>? configuration = null) : base(prefix, rootPath, configuration)
+        public SftpAdapter(string prefix, string rootPath, ISftpClient client, Action<SftpAdapterConfiguration>? configuration = null) : base(prefix, rootPath, configuration)
         {
             this.client = client;
         }
 
         public override void Dispose()
         {
-            client.Dispose();
+            ((IBaseClient) client).Dispose();
         }
 
         public override void Connect()
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -8,22 +8,22 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.16">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.5.0" />
-        <PackageReference Include="xunit.runner.console" Version="2.5.0">
+        <PackageReference Include="xunit" Version="2.5.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.msbuild" Version="2.5.0">
+        <PackageReference Include="xunit.runner.msbuild" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/Tests/src/FileSystem.Adapters.AmazonS3/AmazonS3AdapterTest.cs b/Tests/src/FileSystem.Adapters.AmazonS3/AmazonS3AdapterTest.cs
@@ -237,9 +237,8 @@ public async Task Test_File_Exists_Async()
             Assert.True(await fileSystem.FileExistsAsync("prefix-1://test1.txt"));
             Assert.False(await fileSystem.FileExistsAsync("prefix-1://test2.txt"));
 
-            await Assert.ThrowsAsync<FileNotFoundException>(() => fileSystem.GetFileAsync("prefix-1://test2.txt"));
-            await Assert.ThrowsAsync<ConnectionException>(() => fileSystem.GetFileAsync("prefix-1://test3.txt"));
-            await Assert.ThrowsAsync<ConnectionException>(() => fileSystem.GetFileAsync("prefix-1://test4.txt"));
+            await Assert.ThrowsAsync<ConnectionException>(() => fileSystem.FileExistsAsync("prefix-1://test3.txt"));
+            await Assert.ThrowsAsync<ConnectionException>(() => fileSystem.FileExistsAsync("prefix-1://test4.txt"));
         }
 
         [Fact]
diff --git a/Tests/src/FileSystem.Adapters.Sftp/SftpAdapterTest.cs b/Tests/src/FileSystem.Adapters.Sftp/SftpAdapterTest.cs

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace SharpGrip.FileSystem.Adapters.Sftp`
`5`	`5`	`{`
`6`	`6`	`public static class ModelFactory`
`7`	`7`	`{`
`8`		`- public static IFile CreateFile(SftpFile file, string virtualPath)`
	`8`	`+ public static IFile CreateFile(ISftpFile file, string virtualPath)`
`9`	`9`	`{`
`10`	`10`	`return new FileModel`
`11`	`11`	`{`
`@@ -17,7 +17,7 @@ public static IFile CreateFile(SftpFile file, string virtualPath)`
`17`	`17`	`};`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static DirectoryModel CreateDirectory(SftpFile directory, string virtualPath)`
	`20`	`+ public static DirectoryModel CreateDirectory(ISftpFile directory, string virtualPath)`
`21`	`21`	`{`
`22`	`22`	`return new DirectoryModel`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,16 @@ namespace SharpGrip.FileSystem.Adapters.Sftp`
`18`	`18`	`{`
`19`	`19`	`public class SftpAdapter : Adapter<SftpAdapterConfiguration, string, string>`
`20`	`20`	`{`
`21`		`- private readonly SftpClient client;`
	`21`	`+ private readonly ISftpClient client;`
`22`	`22`
`23`		`- public SftpAdapter(string prefix, string rootPath, SftpClient client, Action<SftpAdapterConfiguration>? configuration = null) : base(prefix, rootPath, configuration)`
	`23`	`+ public SftpAdapter(string prefix, string rootPath, ISftpClient client, Action<SftpAdapterConfiguration>? configuration = null) : base(prefix, rootPath, configuration)`
`24`	`24`	`{`
`25`	`25`	`this.client = client;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public override void Dispose()`
`29`	`29`	`{`
`30`		`- client.Dispose();`
	`30`	`+ ((IBaseClient) client).Dispose();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public override void Connect()`