Fix tests

Author: teoadal

src/Storage.Tests/BucketShould.cs

@@ -2,7 +2,7 @@
 
 public sealed class BucketShould(StorageFixture fixture) : IClassFixture<StorageFixture>
 {
-	private readonly CancellationToken _cancellation = CancellationToken.None;
+	private readonly CancellationToken _ct = CancellationToken.None;
 	private readonly S3Client _client = fixture.S3Client;
 
 	[Fact]
@@ -11,7 +11,7 @@ public async Task CreateBucket()
 		// don't dispose it
 		var client = TestHelper.CloneClient(fixture);
 
-		var bucketCreateResult = await client.CreateBucket(_cancellation);
+		var bucketCreateResult = await client.CreateBucket(_ct);
 
 		bucketCreateResult
 			.Should().BeTrue();
@@ -22,7 +22,7 @@ public async Task CreateBucket()
 	[Fact]
 	public async Task BeExists()
 	{
-		var bucketExistsResult = await _client.IsBucketExists(_cancellation);
+		var bucketExistsResult = await _client.IsBucketExists(_ct);
 
 		bucketExistsResult
 			.Should().BeTrue();
@@ -34,7 +34,7 @@ public async Task BeNotExists()
 		// don't dispose it
 		var client = TestHelper.CloneClient(fixture);
 
-		var bucketExistsResult = await client.IsBucketExists(_cancellation);
+		var bucketExistsResult = await client.IsBucketExists(_ct);
 
 		bucketExistsResult
 			.Should().BeFalse();
@@ -44,7 +44,7 @@ public async Task BeNotExists()
 	public Task NotThrowIfCreateBucketAlreadyExists()
 	{
 		return _client
-			.Invoking(client => client.CreateBucket(_cancellation))
+			.Invoking(client => client.CreateBucket(_ct))
 			.Should().NotThrowAsync();
 	}
 
@@ -55,13 +55,13 @@ public Task NotThrowIfDeleteNotExistsBucket()
 		var client = TestHelper.CloneClient(fixture);
 
 		return client
-			.Invoking(c => c.DeleteBucket(_cancellation))
+			.Invoking(c => c.DeleteBucket(_ct))
 			.Should().NotThrowAsync();
 	}
 
 	private async Task DeleteTestBucket(S3Client client)
 	{
-		var bucketDeleteResult = await client.DeleteBucket(_cancellation);
+		var bucketDeleteResult = await client.DeleteBucket(_ct);
 
 		bucketDeleteResult
 			.Should().BeTrue();

src/Storage.Tests/ClientShould.cs

@@ -2,7 +2,7 @@
 
 public sealed class ClientShould(StorageFixture fixture) : IClassFixture<StorageFixture>
 {
-	private readonly CancellationToken _cancellation = CancellationToken.None;
+	private readonly CancellationToken _ct = CancellationToken.None;
 	private readonly S3Client _client = fixture.S3Client;
 
 	[Fact]
@@ -32,7 +32,7 @@ public Task ThrowIfDisposed()
 		client.Dispose();
 
 		return client
-			.Invoking(c => c.CreateBucket(_cancellation))
+			.Invoking(c => c.CreateBucket(_ct))
 			.Should().ThrowExactlyAsync<ObjectDisposedException>();
 	}
 }

src/Storage.Tests/ObjectShould.cs

@@ -194,6 +194,35 @@ public async Task GetFileUrlWithCyrillicName()
 			.Should().BeTrue(response.ReasonPhrase);
 	}
 
+	[Fact]
+	public async Task HasValidUploadInformation()
+	{
+		var fileName = _fixture.Create<string>();
+
+		using var uploader = await _client.UploadFile(fileName, StreamContentType, _ct);
+
+		uploader
+			.FileName
+			.Should().Be(fileName);
+
+		uploader
+			.UploadId
+			.Should().NotBeEmpty();
+
+		uploader
+			.Written
+			.Should().Be(0);
+
+		var partData = new byte[] { 1, 2, 3 };
+		await uploader.AddPart(partData, _ct);
+
+		uploader
+			.Written
+			.Should().Be(partData.Length);
+
+		await uploader.Abort(_ct);
+	}
+
 	[Fact]
 	public async Task HasValidInformation()
 	{
@@ -334,6 +363,30 @@ public async Task PutBigStream()
 		await DeleteTestFile(fileName);
 	}
 
+	[Fact]
+	public async Task ReadFileStream()
+	{
+		var fileName = await CreateTestFile();
+
+		var buffer = new byte[1024];
+		var file = await _client.GetFile(fileName, _ct);
+		var fileStream = await file.GetStream(_ct);
+
+#pragma warning disable CA1835
+		var read = await fileStream.ReadAsync(buffer, _ct);
+		read.Should().BeGreaterThan(0);
+
+		read = await fileStream.ReadAsync(buffer, 10, 20, _ct);
+		read.Should().BeGreaterThan(0);
+
+		// ReSharper disable once MethodHasAsyncOverloadWithCancellation
+		read = fileStream.Read(buffer, 10, 20);
+		read.Should().BeGreaterThan(0);
+#pragma warning restore CA1835
+
+		await DeleteTestFile(fileName);
+	}
+
 	[Fact]
 	public async Task Upload()
 	{
@@ -425,6 +478,15 @@ public Task NotThrowIfDeleteFileNotExists()
 			.Should().NotThrowAsync();
 	}
 
+	[Fact]
+	public async Task NotThrowIfGetFileStreamNotFound()
+	{
+		var fileName = _fixture.Create<string>();
+		await _client
+			.Invoking(client => client.GetFileStream(fileName, _ct))
+			.Should().NotThrowAsync();
+	}
+
 	[Fact]
 	public async Task ThrowIfBucketNotExists()
 	{
@@ -445,6 +507,27 @@ await _notExistsBucketClient
 			.Should().ThrowAsync<HttpRequestException>();
 	}
 
+	[Fact]
+	public async Task ThrowIfUploadDisposed()
+	{
+		var fileName = _fixture.Create<string>();
+
+		var uploader = await _client.UploadFile(fileName, StreamContentType, _ct);
+		uploader.Dispose();
+
+		await uploader
+			.Invoking(u => u.Abort(_ct))
+			.Should().ThrowExactlyAsync<ObjectDisposedException>();
+
+		await uploader
+			.Invoking(u => u.AddPart([], 0, _ct))
+			.Should().ThrowExactlyAsync<ObjectDisposedException>();
+
+		await uploader
+			.Invoking(u => u.Complete(_ct))
+			.Should().ThrowExactlyAsync<ObjectDisposedException>();
+	}
+
 	private async Task<string> CreateTestFile(
 		string? fileName = null,
 		string contentType = StreamContentType,

src/Storage.Tests/Utils/ValueStringBuilderShould.cs

@@ -18,4 +18,23 @@ public void Grow()
 
 		builder.Length.Should().Be(stringLength);
 	}
+
+	[Fact]
+	public void NotCreateEmptyString()
+	{
+		var builder = new ValueStringBuilder(stackalloc char[64]);
+		builder
+			.ToString()
+			.Should().BeEmpty();
+	}
+
+	[Fact]
+	public void RemoveLastCorrectly()
+	{
+		var builder = new ValueStringBuilder(stackalloc char[64]);
+		builder.RemoveLast();
+
+		builder.Length
+			.Should().BeGreaterThan(-1);
+	}
 }

src/Storage/S3Upload.cs

@@ -63,6 +63,11 @@ public long Written
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public Task<bool> Abort(CancellationToken ct)
 	{
+		if (_disposed)
+		{
+			Errors.Disposed();
+		}
+
 		return _client.MultipartAbort(_encodedFileName, UploadId, ct);
 	}
 
@@ -174,6 +179,11 @@ public async Task<bool> AddParts(byte[] data, CancellationToken ct)
 	/// <returns>Возвращает результат завершения загрузки</returns>
 	public Task<bool> Complete(CancellationToken ct)
 	{
+		if (_disposed)
+		{
+			Errors.Disposed();
+		}
+
 		return _partCount == 0
 			? Task.FromResult(false)
 			: _client.MultipartComplete(_encodedFileName, UploadId, _parts, _partCount, ct);