Преглед на файлове

Added SftpClientTest.Connect.cs to test project for .NET 3.5.
Do not use TPL to allow tests to work on .NET 3.5.

Gert Driesen преди 11 години
родител
ревизия
542b2f80ba

+ 4 - 1
Renci.SshClient/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj

@@ -565,6 +565,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\SftpClientTest.ChangeDirectory.cs">
       <Link>Classes\SftpClientTest.ChangeDirectory.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SftpClientTest.Connect.cs">
+      <Link>Classes\SftpClientTest.Connect.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\SftpClientTest.CreateDirectory.cs">
       <Link>Classes\SftpClientTest.CreateDirectory.cs</Link>
     </Compile>
@@ -817,7 +820,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 3 - 4
Renci.SshClient/Renci.SshNet.Tests/Classes/ShellStreamTest.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -61,7 +60,7 @@ namespace Renci.SshNet.Tests.Classes
 
             var shellStream = CreateShellStream();
 
-            var channelDataPublishTask = Task.Factory.StartNew(() =>
+            var channelDataPublishThread = new Thread(() =>
                 {
                     _channelSessionMock.Raise(p => p.DataReceived += null,
                         new ChannelDataEventArgs(5, _encoding.GetBytes(data1)));
@@ -71,12 +70,12 @@ namespace Renci.SshNet.Tests.Classes
                     _channelSessionMock.Raise(p => p.DataReceived += null,
                         new ChannelDataEventArgs(5, _encoding.GetBytes(data3 + "\r\n")));
                 });
-
+            channelDataPublishThread.Start();
 
             Assert.AreEqual(data1 + data2, shellStream.ReadLine());
             Assert.AreEqual(data3, shellStream.ReadLine());
 
-            channelDataPublishTask.Wait();
+            channelDataPublishThread.Join();
         }
 
         [TestMethod]