rebase main

Author: microzchang

sdk/storage/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "cpp",
   "TagPrefix": "cpp/storage",
-  "Tag": "cpp/storage_92d8f38118"
+  "Tag": "cpp/storage_f268e583e4"
 }

sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp

@@ -841,7 +841,7 @@ namespace Azure { namespace Storage { namespace Test {
     const std::string directoryNameWithTrailingDot = directoryName + ".";
     const std::string connectionString = StandardStorageConnectionString();
     const std::string shareName = m_shareName;
-    auto options = InitClientOptions<Files::Shares::ShareClientOptions>();
+    auto options = InitStorageClientOptions<Files::Shares::ShareClientOptions>();
 
     auto testTrailingDot = [&](bool allowTrailingDot) {
       options.AllowTrailingDot = allowTrailingDot;
@@ -881,7 +881,7 @@ namespace Azure { namespace Storage { namespace Test {
       EXPECT_NO_THROW(directoryClient.SetProperties(Files::Shares::Models::FileSmbProperties()));
 
       // SetMetadata
-      EXPECT_NO_THROW(directoryClient.SetMetadata(GetMetadata()));
+      EXPECT_NO_THROW(directoryClient.SetMetadata(RandomMetadata()));
 
       // ForceCloseHandles
       auto closeHandlesResult = directoryClient.ForceCloseAllHandles();
@@ -903,7 +903,7 @@ namespace Azure { namespace Storage { namespace Test {
     const std::string directoryNameWithTrailingDot = RandomString() + ".";
     const std::string connectionString = StandardStorageConnectionString();
     const std::string shareName = m_shareName;
-    auto options = InitClientOptions<Files::Shares::ShareClientOptions>();
+    auto options = InitStorageClientOptions<Files::Shares::ShareClientOptions>();
 
     auto testTrailingDot = [&](bool allowSourceTrailingDot) {
       options.AllowTrailingDot = true;

sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp

@@ -1036,7 +1036,7 @@ namespace Azure { namespace Storage { namespace Test {
     const std::string fileNameWithTrailingDot = fileName + ".";
     const std::string connectionString = StandardStorageConnectionString();
     const std::string shareName = m_shareName;
-    auto options = InitClientOptions<Files::Shares::ShareClientOptions>();
+    auto options = InitStorageClientOptions<Files::Shares::ShareClientOptions>();
 
     auto testTrailingDot = [&](bool allowTrailingDot) {
       options.AllowTrailingDot = allowTrailingDot;
@@ -1048,7 +1048,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto fileClient = rootDirectoryClient.GetFileClient(fileNameWithTrailingDot);
 
       size_t fileSize = 512;
-      std::vector<uint8_t> content(fileSize, 'x');
+      std::vector<uint8_t> content(RandomBuffer(fileSize));
       auto memBodyStream = Core::IO::MemoryBodyStream(content);
 
       // Create
@@ -1083,7 +1083,7 @@ namespace Azure { namespace Storage { namespace Test {
           Files::Shares::Models::FileHttpHeaders(), Files::Shares::Models::FileSmbProperties()));
 
       // SetMetadata
-      EXPECT_NO_THROW(fileClient.SetMetadata(GetMetadata()));
+      EXPECT_NO_THROW(fileClient.SetMetadata(RandomMetadata()));
 
       // ForceCloseHandles
       auto closeHandlesResult = fileClient.ForceCloseAllHandles();
@@ -1116,7 +1116,7 @@ namespace Azure { namespace Storage { namespace Test {
     const std::string fileNameWithTrailingDot = fileName + ".";
     const std::string connectionString = StandardStorageConnectionString();
     const std::string shareName = m_shareName;
-    auto options = InitClientOptions<Files::Shares::ShareClientOptions>();
+    auto options = InitStorageClientOptions<Files::Shares::ShareClientOptions>();
 
     auto testTrailingDot = [&](bool allowSourceTrailingDot) {
       options.AllowTrailingDot = true;
@@ -1129,7 +1129,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto fileClient = rootDirectoryClient.GetFileClient(fileNameWithTrailingDot);
 
       size_t fileSize = 1 * 1024 * 1024;
-      std::vector<uint8_t> content(fileSize, 'x');
+      std::vector<uint8_t> content(RandomBuffer(fileSize));
       auto memBodyStream = Core::IO::MemoryBodyStream(content);
 
       auto createResult = fileClient.Create(fileSize).Value;
@@ -1223,7 +1223,7 @@ namespace Azure { namespace Storage { namespace Test {
     const std::string fileNameWithTrailingDot = RandomString() + ".";
     const std::string connectionString = StandardStorageConnectionString();
     const std::string shareName = m_shareName;
-    auto options = InitClientOptions<Files::Shares::ShareClientOptions>();
+    auto options = InitStorageClientOptions<Files::Shares::ShareClientOptions>();
 
     auto testTrailingDot = [&](bool allowTrailingDot) {
       options.AllowTrailingDot = allowTrailingDot;
@@ -1233,7 +1233,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto shareClient = shareServiceClient.GetShareClient(shareName);
       auto rootDirectoryClient = shareClient.GetRootDirectoryClient();
       auto fileClient = rootDirectoryClient.GetFileClient(fileNameWithTrailingDot);
-      std::string leaseId1 = Files::Shares::ShareLeaseClient::CreateUniqueLeaseId();
+      std::string leaseId1 = RandomUUID();
       Files::Shares::ShareLeaseClient leaseClient(fileClient, leaseId1);
 
       size_t fileSize = 512;
@@ -1243,7 +1243,7 @@ namespace Azure { namespace Storage { namespace Test {
       EXPECT_NO_THROW(leaseClient.Acquire(Files::Shares::ShareLeaseClient::InfiniteLeaseDuration));
 
       // Change
-      std::string leaseId2 = Files::Shares::ShareLeaseClient::CreateUniqueLeaseId();
+      std::string leaseId2 = RandomUUID();
       EXPECT_NO_THROW(leaseClient.Change(leaseId2));
 
       // Break