gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-10 09:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Array<T>.Empty with Array.Empty<T>() (#1137)

Browse Source
This commit is contained in:
Rob Hague
2023-06-06 23:09:12 +02:00
committed by GitHub
parent 27976bb927
commit a4dbf7763a
16 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs
+4 -4
View File
@@ -22,7 +22,7 @@ namespace Renci.SshNet.Tests.Classes.Common
[TestMethod]
public void ShouldReturnSecondWhenFirstIsEmpty()
{
var first = Array<byte>.Empty;
var first = Array.Empty<byte>();
var second = CreateBuffer(16);
var actual = Extensions.Concat(first, second);
@@ -47,7 +47,7 @@ namespace Renci.SshNet.Tests.Classes.Common
public void ShouldReturnFirstWhenSecondIsEmpty()
{
var first = CreateBuffer(16);
var second = Array<byte>.Empty;
var second = Array.Empty<byte>();
var actual = Extensions.Concat(first, second);
@@ -101,7 +101,7 @@ namespace Renci.SshNet.Tests.Classes.Common
[TestCategory("Performance")]
public void Performance_LargeArray_FirstEmpty()
{
var first = Array<byte>.Empty;
var first = Array.Empty<byte>();
var second = CreateBuffer(50000);
const int runs = 10000;
@@ -115,7 +115,7 @@ namespace Renci.SshNet.Tests.Classes.Common
public void Performance_LargeArray_SecondEmpty()
{
var first = CreateBuffer(50000);
var second = Array<byte>.Empty;
var second = Array.Empty<byte>();
const int runs = 10000;
Performance(first, second, runs);
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
public async Task ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
{
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default)).ReturnsAsync(Array<byte>.Empty);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default)).ReturnsAsync(Array.Empty<byte>());
var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs
+2 -2
View File
@@ -118,7 +118,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence)
.Setup(p => p.RequestReadAsync(_handle, (ulong) _actual, _readBufferSize, default))
.ReturnsAsync(Array<byte>.Empty);
.ReturnsAsync(Array.Empty<byte>());
var buffer = _originalBuffer.Copy();
var actual = await _target.ReadAsync(buffer, 0, buffer.Length);
@@ -136,7 +136,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence)
.Setup(p => p.RequestReadAsync(_handle, (ulong)_actual, _readBufferSize, default))
.ReturnsAsync(Array<byte>.Empty);
.ReturnsAsync(Array.Empty<byte>());
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
await _target.ReadAsync(new byte[10], 0, 10);
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
public async Task SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
{
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData.Length), _readBufferSize, default)).ReturnsAsync(Array<byte>.Empty);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData.Length), _readBufferSize, default)).ReturnsAsync(Array.Empty<byte>());
var buffer = new byte[_numberOfBytesToWriteToReadBuffer + 1];
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
+1 -1
View File
@@ -136,7 +136,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
public void ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
{
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array<byte>.Empty);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array.Empty<byte>());
var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs
+2 -2
View File
@@ -116,7 +116,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence)
.Setup(p => p.RequestRead(_handle, (ulong) _actual, _readBufferSize))
.Returns(Array<byte>.Empty);
.Returns(Array.Empty<byte>());
var buffer = _originalBuffer.Copy();
var actual = _target.Read(buffer, 0, buffer.Length);
@@ -134,7 +134,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence)
.Setup(p => p.RequestRead(_handle, (ulong)_actual, _readBufferSize))
.Returns(Array<byte>.Empty);
.Returns(Array.Empty<byte>());
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
_target.Read(new byte[10], 0, 10);
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
+1 -1
View File
@@ -122,7 +122,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
public void SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
{
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize)).Returns(Array<byte>.Empty);
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize)).Returns(Array.Empty<byte>());
var buffer = new byte[_numberOfBytesToWriteToReadBuffer + 1];
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
+1 -1
View File
@@ -137,7 +137,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(_sequence)
.Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
.Returns(Array<byte>.Empty);
.Returns(Array.Empty<byte>());
var byteRead = _sftpFileStream.ReadByte();
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
+1 -1
View File
@@ -160,7 +160,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
SftpSessionMock.InSequence(_sequence)
.Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
.Returns(Array<byte>.Empty);
.Returns(Array.Empty<byte>());
var byteRead = _sftpFileStream.ReadByte();
src/Renci.SshNet/Common/Array.cs
-7
View File
@@ -1,7 +0,0 @@
namespace Renci.SshNet.Common
{
internal static class Array<T>
{
public static readonly T[] Empty = new T[0];
}
}
src/Renci.SshNet/Common/Extensions.cs
+2 -2
View File
@@ -180,7 +180,7 @@ namespace Renci.SshNet.Common
if (count == 0)
{
return Array<byte>.Empty;
return Array.Empty<byte>();
}
if (offset == 0 && value.Length == count)
@@ -215,7 +215,7 @@ namespace Renci.SshNet.Common
if (count == 0)
{
return Array<byte>.Empty;
return Array.Empty<byte>();
}
if (value.Length == count)
src/Renci.SshNet/Connection/Socks4Connector.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace Renci.SshNet.Connection
{
if (proxyUser == null)
{
return Array<byte>.Empty;
return Array.Empty<byte>();
}
return Encoding.ASCII.GetBytes(proxyUser);
src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using Renci.SshNet.Common;
using System;
namespace Renci.SshNet.Messages.Authentication
{
@@ -44,8 +44,8 @@ namespace Renci.SshNet.Messages.Authentication
public RequestMessageKeyboardInteractive(ServiceName serviceName, string username)
: base(serviceName, username, "keyboard-interactive")
{
Language = Array<byte>.Empty;
SubMethods = Array<byte>.Empty;
Language = Array.Empty<byte>();
SubMethods = Array.Empty<byte>();
}
/// <summary>
src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using System;
using System.Globalization;
using Renci.SshNet.Abstractions;
using Renci.SshNet.Common;
namespace Renci.SshNet.Messages.Transport
{
@@ -23,7 +22,7 @@ namespace Renci.SshNet.Messages.Transport
/// </summary>
public IgnoreMessage()
{
Data = Array<byte>.Empty;
Data = Array.Empty<byte>();
}
/// <summary>
@@ -71,7 +70,7 @@ namespace Renci.SshNet.Messages.Transport
if (dataLength > (DataStream.Length - DataStream.Position))
{
DiagnosticAbstraction.Log("SSH_MSG_IGNORE: Length exceeds data bytes, data ignored.");
Data = Array<byte>.Empty;
Data = Array.Empty<byte>();
}
else
{
src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs
+3 -4
View File
@@ -1,8 +1,7 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Text;
using Renci.SshNet.Common;
namespace Renci.SshNet.Sftp.Responses
{
internal sealed class SftpNameResponse : SftpResponse
@@ -21,7 +20,7 @@ namespace Renci.SshNet.Sftp.Responses
public SftpNameResponse(uint protocolVersion, Encoding encoding)
: base(protocolVersion)
{
Files = Array<KeyValuePair<string, SftpFileAttributes>>.Empty;
Files = Array.Empty<KeyValuePair<string, SftpFileAttributes>>();
Encoding = encoding;
}
src/Renci.SshNet/Sftp/SftpSession.cs
+3 -3
View File
@@ -690,7 +690,7 @@ namespace Renci.SshNet.Sftp
}
else
{
asyncResult.SetAsCompleted(Array<byte>.Empty, completedSynchronously: false);
asyncResult.SetAsCompleted(Array.Empty<byte>(), completedSynchronously: false);
}
});
SendRequest(request);
@@ -767,7 +767,7 @@ namespace Renci.SshNet.Sftp
}
else
{
data = Array<byte>.Empty;
data = Array.Empty<byte>();
}
_ = wait.Set();
@@ -804,7 +804,7 @@ namespace Renci.SshNet.Sftp
{
if (response.StatusCode == StatusCodes.Eof)
{
_ = tcs.TrySetResult(Array<byte>.Empty);
_ = tcs.TrySetResult(Array.Empty<byte>());
}
else
{