Fixed Resources tests to use Az.Monitor.psd1.

Author: MiYanni

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs

@@ -34,7 +34,6 @@
 using Microsoft.Rest;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using ManagedGroups = Microsoft.Azure.Management.ManagementGroups;
 using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
@@ -56,7 +55,7 @@ public sealed class ResourcesController
 
         public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
 
-        public ManagedGroups.ManagementGroupsAPIClient ManagementGroupsApiClient { get; private set; }
+        public ManagementGroupsAPIClient ManagementGroupsApiClient { get; private set; }
 
         public string UserDomain { get; private set; }
 
@@ -90,18 +89,22 @@ public void RunPsTestWorkflow(
             string mockName)
         {
             _helper.TracingInterceptor = interceptor;
-            Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Resources", null);
-            d.Add("Microsoft.Features", null);
-            d.Add("Microsoft.Authorization", null);
-            d.Add("Providers.Test", null);
-            var providersToIgnore = new Dictionary<string, string>();
-            providersToIgnore.Add("Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2016-07-01");
-            providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
+            var d = new Dictionary<string, string>
+            {
+                {"Microsoft.Resources", null},
+                {"Microsoft.Features", null},
+                {"Microsoft.Authorization", null},
+                {"Providers.Test", null}
+            };
+            var providersToIgnore = new Dictionary<string, string>
+            {
+                {"Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2016-07-01"},
+                {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
+            };
             HttpMockServer.Matcher = new ResourcesRecordMatcher(true, d, providersToIgnore);
             HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
 
-            using (MockContext context = MockContext.Start(callingClassType, mockName))
+            using (var context = MockContext.Start(callingClassType, mockName))
             {
                 _helper.SetupEnvironment(AzureModule.AzureResourceManager);
 
@@ -115,7 +118,7 @@ public void RunPsTestWorkflow(
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     _helper.RMProfileModule,
                     _helper.RMResourceModule,
-                    _helper.RMInsightsModule);
+                    _helper.GetRMModulePath("AzureRM.Monitor.psd1"));
 
                 try
                 {
@@ -195,29 +198,29 @@ private GraphRbacManagementClient GetGraphClient(MockContext context)
             return client;
         }
 
-        private AuthorizationManagementClient GetAuthorizationManagementClient(MockContext context)
+        private static AuthorizationManagementClient GetAuthorizationManagementClient(MockContext context)
         {
             return context.GetServiceClient<AuthorizationManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
         }
 
-        private FeatureClient GetFeatureClient(MockContext context)
+        private static FeatureClient GetFeatureClient(MockContext context)
         {
             return context.GetServiceClient<FeatureClient>(TestEnvironmentFactory.GetTestEnvironment());
         }
 
-        private ResourceManagementClient GetResourceManagementClient(MockContext context)
+        private static ResourceManagementClient GetResourceManagementClient(MockContext context)
         {
             return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
         }
 
-        private Internal.Subscriptions.SubscriptionClient GetSubscriptionClient(MockContext context)
+        private static Internal.Subscriptions.SubscriptionClient GetSubscriptionClient(MockContext context)
         {
             return context.GetServiceClient<Internal.Subscriptions.SubscriptionClient>(TestEnvironmentFactory.GetTestEnvironment());
         }
 
-        private ManagedGroups.ManagementGroupsAPIClient GetManagementGroupsApiClient(MockContext context)
+        private static ManagementGroupsAPIClient GetManagementGroupsApiClient(MockContext context)
         {
-            return context.GetServiceClient<ManagedGroups.ManagementGroupsAPIClient>(TestEnvironmentFactory.GetTestEnvironment());
+            return context.GetServiceClient<ManagementGroupsAPIClient>(TestEnvironmentFactory.GetTestEnvironment());
         }
 
         /// <summary>
@@ -228,15 +231,15 @@ private class TestHttpClientHelperFactory : HttpClientHelperFactory
             /// <summary>
             /// The subscription cloud credentials.
             /// </summary>
-            private readonly SubscriptionCloudCredentials credential;
+            private readonly SubscriptionCloudCredentials _credential;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="TestHttpClientHelperFactory"/> class.
             /// </summary>
             /// <param name="credentials"></param>
             public TestHttpClientHelperFactory(SubscriptionCloudCredentials credentials)
             {
-                credential = credentials;
+                _credential = credentials;
             }
 
             /// <summary>
@@ -246,7 +249,7 @@ public TestHttpClientHelperFactory(SubscriptionCloudCredentials credentials)
             /// <param name="headerValues">The headers.</param>
             public override HttpClientHelper CreateHttpClientHelper(SubscriptionCloudCredentials credentials, IEnumerable<ProductInfoHeaderValue> headerValues, Dictionary<string, string> cmdletHeaderValues)
             {
-                return new HttpClientHelperImpl(credentials: credential, headerValues: headerValues, cmdletHeaderValues: cmdletHeaderValues);
+                return new HttpClientHelperImpl(credentials: _credential, headerValues: headerValues, cmdletHeaderValues: cmdletHeaderValues);
             }
 
             /// <summary>