From 1fcec212a1067faf6b79f9886b0450b99a0003f3 Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Thu, 2 Oct 2025 09:52:53 -0700 Subject: [PATCH 1/6] Update tests to use non-deprecated sku. --- .../tests/MapsManagementTestBase.cs | 2 +- .../tests/ScenarioTests/MapsAccountTests.cs | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs b/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs index 1130d849831e..b70c3af9ce2a 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs +++ b/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs @@ -68,7 +68,7 @@ public void VerifyAccountProperties(MapsAccountData account, bool useDefaults, M if (useDefaults) { Assert.AreEqual("East US", account.Location.DisplayName); - Assert.AreEqual(MapsSkuName.S0, account.Sku.Name); + Assert.AreEqual(MapsSkuName.G2, account.Sku.Name); Assert.NotNull(account.Tags); Assert.NotNull(account.Properties.UniqueId); diff --git a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs index 0797089974b5..f16ff21a9a2e 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs +++ b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs @@ -35,11 +35,11 @@ public async Task MapsAccountCreateTest() // Create account var newAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, parameters)).Value; - VerifyAccountProperties(newAccount.Data, true, MapsSkuName.S0); + VerifyAccountProperties(newAccount.Data, true, MapsSkuName.G2); // Now get the account var account = (await mapCollection.GetAsync(accountName)).Value; - VerifyAccountProperties(account.Data, true, MapsSkuName.S0); + VerifyAccountProperties(account.Data, true, MapsSkuName.G2); // Now delete the account await account.DeleteAsync(WaitUntil.Completed); @@ -59,16 +59,14 @@ public async Task MapsAccountUpdateTest() // Create account var newAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, parameters)).Value; - VerifyAccountProperties(newAccount.Data, true, MapsSkuName.S0); + VerifyAccountProperties(newAccount.Data, true, MapsSkuName.G2); // Create new parameters which are almost the same, but have different tags var newParameters = GetDefaultMapsAccountData(); newParameters.Tags.Clear(); newParameters.Tags.Add("key3", "value3"); newParameters.Tags.Add("key4", "value4"); - newParameters.Sku.Name = MapsSkuName.S1; var updatedAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, newParameters)).Value; - VerifyAccountProperties(updatedAccount.Data, false, skuName: MapsSkuName.S1); Assert.AreEqual(2, updatedAccount.Data.Tags.Count); Assert.AreEqual("value3", updatedAccount.Data.Tags["key3"]); Assert.AreEqual("value4", updatedAccount.Data.Tags["key4"]); @@ -111,8 +109,8 @@ public async Task MapsAccountListByResourceGroupTest() accounts = await mapCollection.GetAllAsync().ToEnumerableAsync(); Assert.AreEqual(2, accounts.Count); - VerifyAccountProperties(accounts.First().Data, true, MapsSkuName.S0); - VerifyAccountProperties(accounts.Skip(1).First().Data, true, MapsSkuName.S0); + VerifyAccountProperties(accounts.First().Data, true, MapsSkuName.G2); + VerifyAccountProperties(accounts.Skip(1).First().Data, true, MapsSkuName.G2); } [Test] @@ -134,11 +132,11 @@ public async Task MapsAccountListBySubscriptionTest() var account1 = accounts.First( t => StringComparer.OrdinalIgnoreCase.Equals(t.Data.Name, accountName1.Data.Name)); - VerifyAccountProperties(account1.Data, true, MapsSkuName.S0); + VerifyAccountProperties(account1.Data, true, MapsSkuName.G2); var account2 = accounts.First( t => StringComparer.OrdinalIgnoreCase.Equals(t.Data.Name, accountName2.Data.Name)); - VerifyAccountProperties(account2.Data, true, MapsSkuName.S0); + VerifyAccountProperties(account2.Data, true, MapsSkuName.G2); } [Test] From aac244043ab53ddd0c92578a89696698b57094cf Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Thu, 2 Oct 2025 10:09:53 -0700 Subject: [PATCH 2/6] Missed some. --- .../tests/MapsManagementTestBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs b/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs index b70c3af9ce2a..0edf90abbb97 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs +++ b/sdk/maps/Azure.ResourceManager.Maps/tests/MapsManagementTestBase.cs @@ -48,7 +48,7 @@ protected async Task CreateResourceGroupAsync() protected MapsAccountData GetDefaultMapsAccountData() { - var account = new MapsAccountData(DefaultLocation, new MapsSku(MapsSkuName.S0)) + var account = new MapsAccountData(DefaultLocation, new MapsSku(MapsSkuName.G2)) { Tags = { { "key1", "value1" }, { "key2", "value2" } } }; @@ -88,7 +88,7 @@ public async Task CreateDefaultMapsAccount(MapsAccountColle var accountName = Recording.GenerateAssetName("maps"); var parameters = GetDefaultMapsAccountData(); var newAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, parameters)).Value; - VerifyAccountProperties(newAccount.Data, true, MapsSkuName.S0); + VerifyAccountProperties(newAccount.Data, true, MapsSkuName.G2); return newAccount; } } From e57d6811a8e274f08fa58985eb07e501b755ee6b Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Tue, 7 Oct 2025 09:24:29 -0700 Subject: [PATCH 3/6] Use test attribute that re-records new results after an update. --- .../tests/ScenarioTests/MapsAccountTests.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs index f16ff21a9a2e..5a60573008c3 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs +++ b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reflection.Metadata; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; using Azure.Core; @@ -23,7 +24,7 @@ public MapsAccountTests(bool isAsync) { } - [Test] + [RecordedTest] public async Task MapsAccountCreateTest() { var resourceGroup = await CreateResourceGroupAsync(); @@ -34,10 +35,12 @@ public async Task MapsAccountCreateTest() var parameters = GetDefaultMapsAccountData(); // Create account + Thread.Sleep(30000); var newAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, parameters)).Value; VerifyAccountProperties(newAccount.Data, true, MapsSkuName.G2); // Now get the account + Thread.Sleep(30000); var account = (await mapCollection.GetAsync(accountName)).Value; VerifyAccountProperties(account.Data, true, MapsSkuName.G2); @@ -47,7 +50,7 @@ public async Task MapsAccountCreateTest() Assert.IsFalse(falseResult); } - [Test] + [RecordedTest] public async Task MapsAccountUpdateTest() { var resourceGroup = await CreateResourceGroupAsync(); @@ -66,13 +69,14 @@ public async Task MapsAccountUpdateTest() newParameters.Tags.Clear(); newParameters.Tags.Add("key3", "value3"); newParameters.Tags.Add("key4", "value4"); + Thread.Sleep(30000); var updatedAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, newParameters)).Value; Assert.AreEqual(2, updatedAccount.Data.Tags.Count); Assert.AreEqual("value3", updatedAccount.Data.Tags["key3"]); Assert.AreEqual("value4", updatedAccount.Data.Tags["key4"]); } - [Test] + [RecordedTest] public async Task MapsAccountDeleteTest() { var resourceGroup = await CreateResourceGroupAsync(); @@ -87,13 +91,14 @@ public async Task MapsAccountDeleteTest() var newAccount = await CreateDefaultMapsAccount(mapCollection); // Delete an account + Thread.Sleep(30000); await newAccount.DeleteAsync(WaitUntil.Completed); // Delete an account which was just deleted await newAccount.DeleteAsync(WaitUntil.Completed); } - [Test] + [RecordedTest] public async Task MapsAccountListByResourceGroupTest() { var resourceGroup = await CreateResourceGroupAsync(); @@ -113,7 +118,7 @@ public async Task MapsAccountListByResourceGroupTest() VerifyAccountProperties(accounts.Skip(1).First().Data, true, MapsSkuName.G2); } - [Test] + [RecordedTest] public async Task MapsAccountListBySubscriptionTest() { // Create account @@ -139,7 +144,7 @@ public async Task MapsAccountListBySubscriptionTest() VerifyAccountProperties(account2.Data, true, MapsSkuName.G2); } - [Test] + [RecordedTest] public async Task MapsAccountListKeysTest() { var resourceGroup = await CreateResourceGroupAsync(); @@ -159,7 +164,7 @@ public async Task MapsAccountListKeysTest() Assert.NotNull(keys.SecondaryKey); } - [Test] + [RecordedTest] public async Task MapsAccountRegenerateKeyTest() { var resourceGroup = await CreateResourceGroupAsync(); From be405fa95cb6f740de7efdcf92f474c82248b776 Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Tue, 7 Oct 2025 09:29:43 -0700 Subject: [PATCH 4/6] remove debug --- .../tests/ScenarioTests/MapsAccountTests.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs index 5a60573008c3..343d45692ff5 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs +++ b/sdk/maps/Azure.ResourceManager.Maps/tests/ScenarioTests/MapsAccountTests.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Reflection.Metadata; using System.Text; -using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; using Azure.Core; @@ -35,12 +34,10 @@ public async Task MapsAccountCreateTest() var parameters = GetDefaultMapsAccountData(); // Create account - Thread.Sleep(30000); var newAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, parameters)).Value; VerifyAccountProperties(newAccount.Data, true, MapsSkuName.G2); // Now get the account - Thread.Sleep(30000); var account = (await mapCollection.GetAsync(accountName)).Value; VerifyAccountProperties(account.Data, true, MapsSkuName.G2); @@ -69,7 +66,6 @@ public async Task MapsAccountUpdateTest() newParameters.Tags.Clear(); newParameters.Tags.Add("key3", "value3"); newParameters.Tags.Add("key4", "value4"); - Thread.Sleep(30000); var updatedAccount = (await mapCollection.CreateOrUpdateAsync(WaitUntil.Completed, accountName, newParameters)).Value; Assert.AreEqual(2, updatedAccount.Data.Tags.Count); Assert.AreEqual("value3", updatedAccount.Data.Tags["key3"]); @@ -91,7 +87,6 @@ public async Task MapsAccountDeleteTest() var newAccount = await CreateDefaultMapsAccount(mapCollection); // Delete an account - Thread.Sleep(30000); await newAccount.DeleteAsync(WaitUntil.Completed); // Delete an account which was just deleted From fac1e1e75de18c02826badee1c9c58db48bfbe71 Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Tue, 7 Oct 2025 11:27:19 -0700 Subject: [PATCH 5/6] trigger checks From 0de2a4ab9246138d5f9b31cd569e337653b38e5d Mon Sep 17 00:00:00 2001 From: Marcus Beltman Date: Tue, 7 Oct 2025 14:19:32 -0700 Subject: [PATCH 6/6] update recordings --- sdk/maps/Azure.ResourceManager.Maps/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/maps/Azure.ResourceManager.Maps/assets.json b/sdk/maps/Azure.ResourceManager.Maps/assets.json index 5727ee886b88..1c0452462ff3 100644 --- a/sdk/maps/Azure.ResourceManager.Maps/assets.json +++ b/sdk/maps/Azure.ResourceManager.Maps/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/maps/Azure.ResourceManager.Maps", - "Tag": "net/maps/Azure.ResourceManager.Maps_b72f3a230e" + "Tag": "net/maps/Azure.ResourceManager.Maps_bdbc0ab180" }