[Storage][DataMovement] Fix Blob directory copy tests (Azure#48400)

azure-sdk · Feb 24, 2025 · 1a0cc96 · 1a0cc96
1 parent 133784d
commit 1a0cc96
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json b/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.DataMovement.Blobs",
-  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_214325a4f9"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_ad91d92591"
 }
diff --git a/...ge/Azure.Storage.DataMovement.Blobs/tests/AppendBlobDirectoryToBlockBlobDirectoryTests.cs b/...ge/Azure.Storage.DataMovement.Blobs/tests/AppendBlobDirectoryToBlockBlobDirectoryTests.cs
@@ -31,7 +31,7 @@ protected override Task CreateObjectInDestinationAsync(
             string objectName = null,
             Stream contents = null,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override Task CreateObjectInSourceAsync(
             BlobContainerClient container,

diff --git a/...ge/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToAppendBlobDirectoryTests.cs b/...ge/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToAppendBlobDirectoryTests.cs
@@ -61,7 +61,7 @@ protected override Task CreateObjectInSourceAsync(
             Stream contents = null,
             TransferPropertiesTestType propertiesTestType = TransferPropertiesTestType.Default,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override StorageResourceContainer GetDestinationStorageResourceContainer(
             BlobContainerClient containerClient,

diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToDirectoryTests.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToDirectoryTests.cs
@@ -31,7 +31,7 @@ protected override Task CreateObjectInDestinationAsync(
             string objectName = null,
             Stream contents = null,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override Task CreateObjectInSourceAsync(
             BlobContainerClient container,
@@ -40,7 +40,7 @@ protected override Task CreateObjectInSourceAsync(
             Stream contents = null,
             TransferPropertiesTestType propertiesType = default,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override StorageResourceContainer GetDestinationStorageResourceContainer(
             BlobContainerClient containerClient,

diff --git a/...rage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToPageBlobDirectoryTests.cs b/...rage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToPageBlobDirectoryTests.cs
@@ -39,7 +39,7 @@ protected override Task CreateObjectInSourceAsync(
             Stream contents = null,
             TransferPropertiesTestType propertiesTestType = TransferPropertiesTestType.Default,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override StorageResourceContainer GetDestinationStorageResourceContainer(
             BlobContainerClient containerClient,

diff --git a/...rage/Azure.Storage.DataMovement.Blobs/tests/PageBlobDirectoryToBlockBlobDirectoryTests.cs b/...rage/Azure.Storage.DataMovement.Blobs/tests/PageBlobDirectoryToBlockBlobDirectoryTests.cs
@@ -42,7 +42,7 @@ protected override Task CreateObjectInDestinationAsync(
             string objectName = null,
             Stream contents = null,
             CancellationToken cancellationToken = default)
-            => CreateBlockBlobAsync(container, objectName, contents, cancellationToken);
+            => CreateBlockBlobAsync(container, objectLength, objectName, contents, cancellationToken);
 
         protected override Task CreateObjectInSourceAsync(
             BlobContainerClient container,

diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/StartTransferBlobDirectoryCopyTestBase.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/StartTransferBlobDirectoryCopyTestBase.cs
@@ -39,7 +39,7 @@ public abstract class StartTransferBlobDirectoryCopyTestBase<TSourceObjectClient
     where TDestinationObjectClient : BlobBaseClient
     {
         private readonly AccessTier _defaultAccessTier = AccessTier.Cold;
-        private const string _defaultContentType = "text/plain";
+        private const string _defaultContentType = "image/jpeg";
         private const string _defaultContentLanguage = "en-US";
         private const string _defaultContentDisposition = "inline";
         private const string _defaultCacheControl = "no-cache";
@@ -81,21 +81,22 @@ protected override Task CreateDirectoryInSourceAsync(
 
         internal async Task CreateBlockBlobAsync(
             BlobContainerClient container,
-            string blobName,
-            Stream contents,
+            long? objectLength = null,
+            string objectName = null,
+            Stream contents = null,
             CancellationToken cancellationToken = default)
         {
             CancellationHelper.ThrowIfCancellationRequested(cancellationToken);
-            blobName ??= GetNewObjectName();
+            objectName ??= GetNewObjectName();
 
-            BlockBlobClient blobClient = container.GetBlockBlobClient(blobName);
+            BlockBlobClient blobClient = container.GetBlockBlobClient(objectName);
             if (contents != default)
             {
                 await blobClient.UploadAsync(contents, cancellationToken: cancellationToken);
             }
             else
             {
-                var data = new byte[0];
+                byte[] data = GetRandomBuffer(objectLength ?? 0);
                 using (var stream = new MemoryStream(data))
                 {
                     await blobClient.UploadAsync(
@@ -163,7 +164,7 @@ internal async Task CreateAppendBlobAsync(
             }
             else
             {
-                var data = new byte[0];
+                byte[] data = GetRandomBuffer(objectLength ?? 0);
                 using (var stream = new MemoryStream(data))
                 {
                     await UploadAppendBlocksAsync(
@@ -222,7 +223,7 @@ internal async Task CreatePageBlobAsync(
             }
             else
             {
-                var data = new byte[0];
+                byte[] data = GetRandomBuffer(objectLength ?? 0);
                 using (var stream = new MemoryStream(data))
                 {
                     await UploadPagesAsync(