Update test project for KeyVault (#12228)

* update test projects * fix incorrect project reference for Resources test project
Azure · May 21, 2020 · e0d1994 · e0d1994
1 parent 11f9b7f
commit e0d1994
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 45 deletions.
diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj b/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <ProjectReference Include="..\..\..\testcommon\Azure.Graph.Rbac\src\Azure.Graph.Rbac.csproj" />
-    <ProjectReference Include="..\..\..\testcommon\Azure.Management.Resource.2017_05\src\Azure.Management.Resource.csproj" />
     <ProjectReference Include="..\..\..\testcommon\Azure.Management.Resources.2017_05\src\Azure.Management.Resources.csproj" />
     <ProjectReference Include="..\src\Azure.Management.KeyVault.csproj" />
   </ItemGroup>

diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/KeyVaultManagementTestEnvironment.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/KeyVaultManagementTestEnvironment.cs
@@ -7,21 +7,8 @@ namespace Azure.Management.KeyVault.Tests
 {
     public class KeyVaultManagementTestEnvironment : TestEnvironment
     {
-        private const string TenantIdKey = "TenantId";
-        private const string SubIdKey = "SubId";
-        private const string ApplicationIdKey = "ApplicationId";
-
         public KeyVaultManagementTestEnvironment() : base("keyvalutmgmt")
         {
         }
-
-        //Do not need to save to session record
-        public string UserName => GetVariable("AZURE_USER_NAME");
-
-        public string TenantIdTrack1 => GetRecordedVariable(TenantIdKey);
-
-        public string SubscriptionIdTrack1 => GetRecordedVariable(SubIdKey);
-
-        public string ApplicationIdTrack1 => GetRecordedVariable(ApplicationIdKey);
     }
 }
diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs
@@ -53,7 +53,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete()
             ValidateVault(createdVault,
                 VaultName,
                 ResGroupName,
-                SubscriptionId,
+                TestEnvironment.SubscriptionId,
                 TenantIdGuid,
                 Location,
                 "A",
@@ -86,7 +86,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete()
             ValidateVault(updateVault,
                 VaultName,
                 ResGroupName,
-                SubscriptionId,
+                TestEnvironment.SubscriptionId,
                 TenantIdGuid,
                 Location,
                 "A",
@@ -107,7 +107,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete()
             ValidateVault(retrievedVault,
                 VaultName,
                 ResGroupName,
-                SubscriptionId,
+                TestEnvironment.SubscriptionId,
                 TenantIdGuid,
                 Location,
                 "A",
@@ -136,7 +136,7 @@ await VaultsClient.GetAsync(
         [Test]
         public async Task CreateKeyVaultDisableSoftDelete()
         {
-            this.AccessPolicy.ApplicationId = Guid.Parse(this.ApplicationId);
+            this.AccessPolicy.ApplicationId = Guid.Parse(TestEnvironment.ClientId);
             this.VaultProperties.EnableSoftDelete = false;
 
             var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties);
@@ -156,7 +156,7 @@ public async Task CreateKeyVaultDisableSoftDelete()
         [Test]
         public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy()
         {
-            AccessPolicy.ApplicationId = Guid.Parse(ApplicationId);
+            AccessPolicy.ApplicationId = Guid.Parse(TestEnvironment.ClientId);
             VaultProperties.EnableSoftDelete = null;
 
             var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties);
@@ -172,7 +172,7 @@ public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy
             ValidateVault(vaultResponse.Value,
                 VaultName,
                 ResGroupName,
-                SubscriptionId,
+                TestEnvironment.SubscriptionId,
                 TenantIdGuid,
                 Location,
                 "A",
@@ -192,7 +192,7 @@ public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy
             ValidateVault(retrievedVault.Value,
                 VaultName,
                 ResGroupName,
-                SubscriptionId,
+                TestEnvironment.SubscriptionId,
                 TenantIdGuid,
                 Location,
                 "A",

diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs
@@ -11,8 +11,6 @@
 using Azure.Management.KeyVault.Models;
 using Azure.Management.Resources;
 
-using NUnit.Framework;
-
 namespace Azure.Management.KeyVault.Tests
 {
     [ClientTestFixture]
@@ -21,11 +19,9 @@ public abstract class VaultOperationsTestsBase : RecordedTestBase<KeyVaultManage
         private const string ObjectIdKey = "ObjectId";
         public static TimeSpan ZeroPollingInterval { get; } = TimeSpan.FromSeconds(0);
 
-        public string TenantId { get; set; }
         public string ObjectId { get; set; }
-        public string ApplicationId { get; set; }
+        //Could not use TestEnvironment.Location since Location is got dynamically
         public string Location { get; set; }
-        public string SubscriptionId { get; set; }
 
         public AccessPolicyEntry AccessPolicy { get; internal set; }
         public string ResGroupName { get; internal set; }
@@ -47,19 +43,6 @@ protected VaultOperationsTestsBase(bool isAsync)
 
         protected async Task Initialize()
         {
-            if (Mode == RecordedTestMode.Playback && Recording.IsTrack1SessionRecord())
-            {
-                this.TenantId = TestEnvironment.TenantIdTrack1;
-                this.SubscriptionId = TestEnvironment.SubscriptionIdTrack1;
-                this.ApplicationId = TestEnvironment.ApplicationIdTrack1;
-            }
-            else
-            {
-                this.TenantId = TestEnvironment.TenantId;
-                this.SubscriptionId = TestEnvironment.SubscriptionId;
-                this.ApplicationId = TestEnvironment.ClientId;
-            }
-
             var resourceManagementClient = GetResourceManagementClient();
             ResourcesClient = resourceManagementClient.GetResourcesClient();
             ResourceGroupsClient = resourceManagementClient.GetResourceGroupsClient();
@@ -74,8 +57,8 @@ protected async Task Initialize()
             }
             else if (Mode == RecordedTestMode.Record)
             {
-                var spClient = new RbacManagementClient(this.TenantId, TestEnvironment.Credential).GetServicePrincipalsClient();
-                var servicePrincipalList = spClient.ListAsync($"appId eq '{this.ApplicationId}'");
+                var spClient = new RbacManagementClient(TestEnvironment.TenantId, TestEnvironment.Credential).GetServicePrincipalsClient();
+                var servicePrincipalList = spClient.ListAsync($"appId eq '{TestEnvironment.ClientId}'");
                 await foreach (var servicePrincipal in servicePrincipalList)
                 {
                     this.ObjectId = servicePrincipal.ObjectId;
@@ -98,7 +81,7 @@ protected async Task Initialize()
             await ResourceGroupsClient.CreateOrUpdateAsync(ResGroupName, new Resources.Models.ResourceGroup(Location));
             VaultName = Recording.GenerateAssetName("sdktestvault");
 
-            TenantIdGuid = new Guid(TenantId);
+            TenantIdGuid = new Guid(TestEnvironment.TenantId);
             Tags = new Dictionary<string, string> { { "tag1", "value1" }, { "tag2", "value2" }, { "tag3", "value3" } };
 
             var permissions = new Permissions
@@ -128,14 +111,14 @@ protected async Task Initialize()
 
         internal KeyVaultManagementClient GetKeyVaultManagementClient()
         {
-            return InstrumentClient(new KeyVaultManagementClient(this.SubscriptionId,
+            return InstrumentClient(new KeyVaultManagementClient(TestEnvironment.SubscriptionId,
                 TestEnvironment.Credential,
                 Recording.InstrumentClientOptions(new KeyVaultManagementClientOptions())));
         }
 
         internal ResourcesManagementClient GetResourceManagementClient()
         {
-            return InstrumentClient(new ResourcesManagementClient(this.SubscriptionId,
+            return InstrumentClient(new ResourcesManagementClient(TestEnvironment.SubscriptionId,
                 TestEnvironment.Credential,
                 Recording.InstrumentClientOptions(new ResourcesManagementClientOptions())));
         }

diff --git a/sdk/resources/Azure.Management.Resources/tests/Azure.Management.Resources.Tests.csproj b/sdk/resources/Azure.Management.Resources/tests/Azure.Management.Resources.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <ProjectReference Include="..\src\Azure.Management.Resource.csproj" />
+    <ProjectReference Include="..\src\Azure.Management.Resources.csproj" />
   </ItemGroup>
 </Project>