Merge pull request #270 from Azure/dev

,

Author: huangpf

src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs

@@ -15,7 +15,6 @@
 
 using System.Linq;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.Azure.Management.Resources;
 using Xunit;
 using Microsoft.Azure.Test;
 using Microsoft.Azure.Graph.RBAC;
@@ -300,10 +299,13 @@ public void TestSetRemoveAccessPolicyByObjectId()
         {
             string upn = "";
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3}", "Test-SetRemoveAccessPolicyByObjectId", _data.preCreatedVault, _data.resourceGroupName, upn) };
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3}", "Test-SetRemoveAccessPolicyByObjectId", _data.preCreatedVault, _data.resourceGroupName, objId) };
                 },
                 (env) =>
                 {
@@ -345,10 +347,13 @@ public void TestSetRemoveAccessPolicyByCompoundId()
             string upn = "";
             Guid? appId = null;
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetRemoveAccessPolicyByCompoundId", _data.preCreatedVault, _data.resourceGroupName, upn, appId) };
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetRemoveAccessPolicyByCompoundId", _data.preCreatedVault, _data.resourceGroupName, appId, objId) };
                 },
                 (env) =>
                 {
@@ -367,13 +372,17 @@ public void TestSetRemoveAccessPolicyByCompoundId()
         public void TestRemoveAccessPolicyWithCompoundIdPolicies()
         {
             string upn = "";
+
             Guid? appId1 = null;
             Guid? appId2 = null;
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3} {4} {5}", "Test-RemoveAccessPolicyWithCompoundIdPolicies", _data.preCreatedVault, _data.resourceGroupName, upn, appId1, appId2) };
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3} {4} {5}", "Test-RemoveAccessPolicyWithCompoundIdPolicies", _data.preCreatedVault, _data.resourceGroupName, appId1, appId2, objId) };
                 },
                 (env) =>
                 {
@@ -395,10 +404,13 @@ public void TestSetCompoundIdAccessPolicy()
             string upn = "";
             Guid? appId = null;
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetCompoundIdAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, upn, appId) };
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetCompoundIdAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, appId, objId) };
                 },
                 (env) =>
                 {
@@ -455,14 +467,18 @@ public void TestModifyAccessPolicy()
         {
             string upn = "";
 
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, upn) };
+
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, objId) };
                 },
                 (env) =>
-                {                    
+                {
                     Initialize();
                     upn = GetUser(env.GetTestEnvironment());
                 },
@@ -573,15 +589,17 @@ public void TestModifyAccessPolicyNegativeCases()
         public void TestRemoveNonExistentAccessPolicyDoesNotThrow()
         {
             string upn = "";
-
             _data.ResetPreCreatedVault();
-            KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
+
+            KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
+            controller.RunPsTestWorkflow(
                 () =>
                 {
-                    return new[] { string.Format("{0} {1} {2} {3}", "Test-RemoveNonExistentAccessPolicyDoesNotThrow", _data.preCreatedVault, _data.resourceGroupName, upn) };
+                    var objId = GetUserObjectId(controller, upn);
+                    return new[] { string.Format("{0} {1} {2} {3}", "Test-RemoveNonExistentAccessPolicyDoesNotThrow", _data.preCreatedVault, _data.resourceGroupName, objId) };
                 },
                 (env) =>
-                {                    
+                {
                     Initialize();
                     upn = GetUser(env.GetTestEnvironment());
                 },
@@ -623,6 +641,20 @@ private string GetUser(TestEnvironment environment)
             }
         }
 
+        private string GetUserObjectId(KeyVaultManagementController controllerAdmin, string upn)
+        {
+            if (HttpMockServer.Mode == HttpRecorderMode.Record)
+            {
+                var result = controllerAdmin.GraphClient.User.Get(upn);
+                HttpMockServer.Variables["ObjectId"] = result.User.ObjectId;
+                return result.User.ObjectId;
+            }
+            else
+            {
+                return HttpMockServer.Variables["ObjectId"];
+            }
+        }
+
         private Guid GetApplicationId(TestEnvironment environment, int appNum)
         {
             if (appNum < 0)