From c56d46ab59fe30fd1782234a4865aee0f22b2af5 Mon Sep 17 00:00:00 2001 From: Jinming Hu Date: Wed, 22 Feb 2023 17:53:02 +0800 Subject: [PATCH 1/3] remove constant blob content remove usage of testname() --- .../test/ut/append_blob_client_test.cpp | 4 ++-- .../test/ut/blob_container_client_test.cpp | 4 ++-- .../test/ut/block_blob_client_test.cpp | 8 ++++---- .../azure-storage-blobs/test/ut/page_blob_client_test.cpp | 2 +- .../azure-storage-blobs/test/ut/storage_timeout_test.cpp | 4 +--- .../test/ut/datalake_file_client_test.cpp | 8 ++++---- .../test/ut/queue_service_client_test.cpp | 6 +----- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp index 310c360734..002c5cad07 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp @@ -26,8 +26,8 @@ namespace Azure { namespace Storage { namespace Test { m_appendBlobClient = std::make_shared( m_blobContainerClient->GetAppendBlobClient(m_blobName)); m_appendBlobClient->Create(); - std::vector blobContent1(static_cast(1_KB), 'x'); - std::vector blobContent2(static_cast(512), 'a'); + std::vector blobContent1 = RandomBuffer(1_KB); + std::vector blobContent2 = RandomBuffer(512); auto blobContent = Azure::Core::IO::MemoryBodyStream(blobContent1.data(), blobContent1.size()); m_appendBlobClient->AppendBlock(blobContent); blobContent = Azure::Core::IO::MemoryBodyStream(blobContent2.data(), blobContent2.size()); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp index 1716652efd..8be8f3d052 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp @@ -538,7 +538,7 @@ namespace Azure { namespace Storage { namespace Test { } { std::string containerName = GetLowercaseIdentifier() + "1"; - std::string blobName = GetTestName() + "1"; + std::string blobName = RandomString() + "1"; Blobs::BlobClientOptions options; options.EncryptionScope = testEncryptionScope; auto containerClient2 = GetBlobContainerClientForTest(containerName, options); @@ -581,7 +581,7 @@ namespace Azure { namespace Storage { namespace Test { containerClient2.Delete(); } { - std::string blobName = GetTestName() + "2"; + std::string blobName = RandomString() + "2"; Blobs::BlobClientOptions options; options.EncryptionScope = testEncryptionScope; auto appendBlobClient diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp index ec2954dd7c..85b8414363 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp @@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Test { m_blobUploadOptions.HttpHeaders.ContentEncoding = "identity"; m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear(); m_blobUploadOptions.AccessTier = Azure::Storage::Blobs::Models::AccessTier::Hot; - m_blobContent = std::vector(static_cast(1_KB), 'x'); + m_blobContent = RandomBuffer(1_KB); auto blobContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); m_blockBlobClient->Upload(blobContent, m_blobUploadOptions); @@ -187,7 +187,7 @@ namespace Azure { namespace Storage { namespace Test { tags["key2"] = "value2"; tags["key3 +-./:=_"] = "v1 +-./:=_"; - std::vector blobContent(10, 'a'); + std::vector blobContent = RandomBuffer(10); { Blobs::UploadBlockBlobOptions options; options.Tags = tags; @@ -1221,7 +1221,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(BlockBlobClientTest, UploadFromUri) { auto srcBlobClient = *m_blockBlobClient; - std::vector blobContent(100, 'a'); + std::vector blobContent = RandomBuffer(100); srcBlobClient.UploadFrom(blobContent.data(), blobContent.size()); std::map srcTags; srcTags["srctags"] = "a1212"; @@ -1302,7 +1302,7 @@ namespace Azure { namespace Storage { namespace Test { { auto blobClient = *m_blockBlobClient; - const std::vector content(static_cast(1), 'a'); + const std::vector content = RandomBuffer(1); const std::string blockId = Base64EncodeText(std::string(64, '0')); auto blockContent = Azure::Core::IO::MemoryBodyStream(content.data(), content.size()); blobClient.StageBlock(blockId, blockContent); diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp index 1e3e66cc40..377c01311d 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp @@ -29,7 +29,7 @@ namespace Azure { namespace Storage { namespace Test { m_blobName = RandomString(); m_pageBlobClient = std::make_shared( m_blobContainerClient->GetPageBlobClient(m_blobName)); - m_blobContent = std::vector(static_cast(1_KB), 'x'); + m_blobContent = RandomBuffer(1_KB); auto blobContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); m_pageBlobClient->Create(2_KB); diff --git a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp index 8e09de5ef6..34fd18ccf9 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp @@ -52,13 +52,11 @@ namespace Azure { namespace Storage { namespace Test { } }; - m_testContext.RenameTest(GetTestName()); - auto peekPolicyPtr = std::make_unique(callback); Blobs::BlobClientOptions clientOptions = InitClientOptions(); clientOptions.PerRetryPolicies.emplace_back(std::move(peekPolicyPtr)); auto containerClient = Azure::Storage::Blobs::BlobContainerClient::CreateFromConnectionString( - StandardStorageConnectionString(), GetTestNameLowerCase(), clientOptions); + StandardStorageConnectionString(), LowercaseRandomString(), clientOptions); containerClient.DeleteIfExists(); EXPECT_FALSE(timeout.HasValue()); diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp index 1503bdc874..e6acc9e09c 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp @@ -217,8 +217,8 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(DataLakeFileClientTest, FileDataActions) { - const int32_t bufferSize = 4 * 1024; // 4KB data size - std::vector buffer(bufferSize, 'x'); + const int32_t bufferSize = 10; + std::vector buffer = RandomBuffer(bufferSize); auto bufferStream = std::make_unique( Azure::Core::IO::MemoryBodyStream(buffer)); auto properties1 = m_fileClient->GetProperties(); @@ -468,8 +468,8 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(DataLakeFileClientTest, FileReadReturns) { - const int32_t bufferSize = 4 * 1024; // 4KB data size - std::vector buffer(bufferSize, 'x'); + const int32_t bufferSize = 20; + std::vector buffer = RandomBuffer(bufferSize); auto bufferStream = std::make_unique( Azure::Core::IO::MemoryBodyStream(buffer)); std::string newFileName("fileForTest"); diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp index e4870cf960..b04874688b 100644 --- a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp +++ b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp @@ -45,8 +45,6 @@ namespace Azure { namespace Storage { namespace Test { StorageTest::SetUp(); m_options = InitClientOptions(); - m_testName = GetTestName(); - m_testNameLowercase = GetTestNameLowerCase(); m_queueServiceClient = std::make_shared( Queues::QueueServiceClient::CreateFromConnectionString( StandardStorageConnectionString(), m_options)); @@ -55,8 +53,6 @@ namespace Azure { namespace Storage { namespace Test { std::shared_ptr m_queueServiceClient; Queues::QueueClientOptions m_options; - std::string m_testName; - std::string m_testNameLowercase; }; TEST_F(QueueServiceClientTest, ListQueues) @@ -268,7 +264,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(QueueServiceClientTest, CreateDeleteQueue) { - std::string queueName = m_testNameLowercase; + std::string queueName = LowercaseRandomString(); auto queueClient = m_queueServiceClient->CreateQueue(queueName); EXPECT_NO_THROW(queueClient.Value.GetProperties()); From 7d405403f0375d2963125c07e4b103f03735fc40 Mon Sep 17 00:00:00 2001 From: Jinming Hu Date: Wed, 22 Feb 2023 17:55:53 +0800 Subject: [PATCH 2/3] update recording --- sdk/storage/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/assets.json b/sdk/storage/assets.json index 70b4d7a609..dc46939212 100644 --- a/sdk/storage/assets.json +++ b/sdk/storage/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "cpp", "TagPrefix": "cpp/storage", - "Tag": "cpp/storage_fc079eacac" + "Tag": "cpp/storage_925cef0316" } From 2520ffe93429ea0df5b6c47c162856a85922d12c Mon Sep 17 00:00:00 2001 From: Jinming Hu Date: Wed, 22 Feb 2023 20:23:45 +0800 Subject: [PATCH 3/3] fix compiler warnings --- .../azure-storage-blobs/test/ut/append_blob_client_test.cpp | 2 +- .../azure-storage-blobs/test/ut/block_blob_client_test.cpp | 2 +- .../azure-storage-blobs/test/ut/page_blob_client_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp index 002c5cad07..6e0d1c5b65 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp @@ -26,7 +26,7 @@ namespace Azure { namespace Storage { namespace Test { m_appendBlobClient = std::make_shared( m_blobContainerClient->GetAppendBlobClient(m_blobName)); m_appendBlobClient->Create(); - std::vector blobContent1 = RandomBuffer(1_KB); + std::vector blobContent1 = RandomBuffer(static_cast(1_KB)); std::vector blobContent2 = RandomBuffer(512); auto blobContent = Azure::Core::IO::MemoryBodyStream(blobContent1.data(), blobContent1.size()); m_appendBlobClient->AppendBlock(blobContent); diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp index 85b8414363..9ad68c461b 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp @@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Test { m_blobUploadOptions.HttpHeaders.ContentEncoding = "identity"; m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear(); m_blobUploadOptions.AccessTier = Azure::Storage::Blobs::Models::AccessTier::Hot; - m_blobContent = RandomBuffer(1_KB); + m_blobContent = RandomBuffer(static_cast(1_KB)); auto blobContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); m_blockBlobClient->Upload(blobContent, m_blobUploadOptions); diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp index 377c01311d..f9aa17d594 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp @@ -29,7 +29,7 @@ namespace Azure { namespace Storage { namespace Test { m_blobName = RandomString(); m_pageBlobClient = std::make_shared( m_blobContainerClient->GetPageBlobClient(m_blobName)); - m_blobContent = RandomBuffer(1_KB); + m_blobContent = RandomBuffer(static_cast(1_KB)); auto blobContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); m_pageBlobClient->Create(2_KB);