diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/BufferedMultipartStream.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/BufferedMultipartStream.cs index f7ea5a65979b..47482ca799af 100644 --- a/sdk/src/Services/S3/Custom/Transfer/Internal/BufferedMultipartStream.cs +++ b/sdk/src/Services/S3/Custom/Transfer/Internal/BufferedMultipartStream.cs @@ -39,7 +39,6 @@ internal class BufferedMultipartStream : Stream { private readonly IDownloadManager _downloadCoordinator; private readonly IPartBufferManager _partBufferManager; - private readonly BufferedDownloadConfiguration _config; private bool _initialized = false; private bool _disposed = false; @@ -59,12 +58,10 @@ internal class BufferedMultipartStream : Stream /// /// that coordinates download discovery and orchestration. /// that manages part buffer lifecycle and synchronization. - /// with settings for the stream. - public BufferedMultipartStream(IDownloadManager downloadCoordinator, IPartBufferManager partBufferManager, BufferedDownloadConfiguration config) + public BufferedMultipartStream(IDownloadManager downloadCoordinator, IPartBufferManager partBufferManager) { _downloadCoordinator = downloadCoordinator ?? throw new ArgumentNullException(nameof(downloadCoordinator)); _partBufferManager = partBufferManager ?? throw new ArgumentNullException(nameof(partBufferManager)); - _config = config ?? throw new ArgumentNullException(nameof(config)); } /// @@ -97,7 +94,7 @@ public static BufferedMultipartStream Create(IAmazonS3 s3Client, TransferUtility var dataHandler = new BufferedPartDataHandler(partBufferManager, config); var downloadCoordinator = new MultipartDownloadManager(s3Client, request, config, dataHandler, requestEventHandler); - return new BufferedMultipartStream(downloadCoordinator, partBufferManager, config); + return new BufferedMultipartStream(downloadCoordinator, partBufferManager); } /// diff --git a/sdk/test/Services/S3/UnitTests/Custom/BufferedMultipartStreamTests.cs b/sdk/test/Services/S3/UnitTests/Custom/BufferedMultipartStreamTests.cs index 29f966f34569..b6945f93b977 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/BufferedMultipartStreamTests.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/BufferedMultipartStreamTests.cs @@ -53,7 +53,7 @@ public void Setup() private BufferedMultipartStream CreateStream() { - return new BufferedMultipartStream(_mockCoordinator.Object, _mockBufferManager.Object, _config); + return new BufferedMultipartStream(_mockCoordinator.Object, _mockBufferManager.Object); } private async Task CreateInitializedStreamAsync( @@ -98,20 +98,18 @@ public void Constructor_WithValidDependencies_CreatesStream() } [DataTestMethod] - [DataRow(null, "bufferManager", "config", DisplayName = "Null Coordinator")] - [DataRow("coordinator", null, "config", DisplayName = "Null Buffer Manager")] - [DataRow("coordinator", "bufferManager", null, DisplayName = "Null Config")] + [DataRow(null, "bufferManager", DisplayName = "Null Coordinator")] + [DataRow("coordinator", null, DisplayName = "Null Buffer Manager")] [ExpectedException(typeof(ArgumentNullException))] public void Constructor_WithNullParameter_ThrowsArgumentNullException( - string coordinatorKey, string bufferManagerKey, string configKey) + string coordinatorKey, string bufferManagerKey) { // Arrange var coordinator = coordinatorKey != null ? _mockCoordinator.Object : null; var bufferManager = bufferManagerKey != null ? _mockBufferManager.Object : null; - var config = configKey != null ? _config : null; // Act - var stream = new BufferedMultipartStream(coordinator, bufferManager, config); + var stream = new BufferedMultipartStream(coordinator, bufferManager); } #endregion @@ -173,8 +171,7 @@ public async Task InitializeAsync_SinglePart_SetsCorrectDiscoveryResult() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -185,6 +182,9 @@ public async Task InitializeAsync_SinglePart_SetsCorrectDiscoveryResult() Assert.AreEqual(1024, stream.DiscoveryResult.ObjectSize); } + #endregion + + #region InitializeAsync Tests - Multipart [TestMethod] public async Task InitializeAsync_Multipart_UsesMultipartHandler() @@ -203,8 +203,7 @@ public async Task InitializeAsync_Multipart_UsesMultipartHandler() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -231,8 +230,7 @@ public async Task InitializeAsync_SinglePart_CallsStartDownloads() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -265,8 +263,7 @@ public async Task InitializeAsync_Multipart_StartsDownloads() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -299,8 +296,7 @@ public async Task InitializeAsync_SetsDiscoveryResult() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -329,8 +325,7 @@ public async Task InitializeAsync_CalledTwice_ThrowsInvalidOperationException() .ReturnsAsync(discoveryResult); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); // Act await stream.InitializeAsync(CancellationToken.None); @@ -348,8 +343,7 @@ public async Task ReadAsync_BeforeInitialize_ThrowsInvalidOperationException() // Arrange var mockCoordinator = new Mock(); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); var buffer = new byte[1024]; @@ -364,8 +358,7 @@ public async Task ReadAsync_AfterDispose_ThrowsObjectDisposedException() // Arrange var mockCoordinator = new Mock(); var mockBufferManager = new Mock(); - var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration(); - var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config); + var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object); stream.Dispose(); var buffer = new byte[1024];