Merge pull request #597 from markcowl/signing

Shortening mock tests for servicemanagement networking

Author: markcowl

src/Common/Commands.ScenarioTests.Common/Mocks/MockClientFactory.cs

@@ -19,6 +19,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
 using Hyak.Common;
 using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.Azure.Common;
@@ -96,7 +98,7 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
                 {
                     throw new ArgumentException(
                         string.Format("TestManagementClientHelper class wasn't initialized with the {0} client.",
-                            typeof(TClient).Name));
+                            typeof (TClient).Name));
                 }
                 else
                 {
@@ -107,6 +109,13 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
                     return newRealClient;
                 }
             }
+            else
+            {
+                // Use the WithHandler method to create an extra reference to the http client
+                // this will prevent the httpClient from being disposed in a long-running test using 
+                // the same client for multiple cmdlets
+                client = client.WithHandler(new PassThroughDelegatingHandler());
+            }
 
             return client;
         }
@@ -162,5 +171,17 @@ public void AddUserAgent(string productName)
         }
 
         public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
+
+        /// <summary>
+        /// This class exists to allow adding an additional reference to the httpClient to prevent the client 
+        /// from being disposed.  Should not be used execpt in this mocked context.
+        /// </summary>
+        class PassThroughDelegatingHandler : DelegatingHandler
+        {
+            protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+            {
+                return base.SendAsync(request, cancellationToken);
+            }
+        }
     }
 }

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs

@@ -12,13 +12,16 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests
 {
     using Microsoft.Azure.Common.Authentication;
     using Microsoft.Azure.Test;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
     using Microsoft.WindowsAzure.Management;
+    using Microsoft.WindowsAzure.Management.Compute;
     using Microsoft.WindowsAzure.Management.Network;
+    using Microsoft.WindowsAzure.Management.Storage;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
@@ -66,7 +69,9 @@ protected void SetupManagementClients()
         {
             var client = TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
             var client2 = TestBase.GetServiceClient<ManagementClient>(new RDFETestEnvironmentFactory());
-            helper.SetupSomeOfManagementClients(client, client2);
+            var client3 = TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
+            var client4 = TestBase.GetServiceClient<ComputeManagementClient>(new RDFETestEnvironmentFactory());
+            helper.SetupManagementClients(client, client2, client3, client4);
         }
 
         protected void RunPowerShellTest(params string[] scripts)

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs

@@ -12,6 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure.Management.Compute;
+using Microsoft.WindowsAzure.Management.Storage;
+
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests
 {
     using Microsoft.Azure.Common.Authentication;
@@ -73,7 +76,9 @@ protected void SetupManagementClients()
         {
             var client = TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
             var client2 = TestBase.GetServiceClient<ManagementClient>(new RDFETestEnvironmentFactory());
-            helper.SetupSomeOfManagementClients(client, client2);
+            var client3 = TestBase.GetServiceClient<ComputeManagementClient>(new RDFETestEnvironmentFactory());
+            var client4 = TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
+            helper.SetupManagementClients(client, client2, client3, client4);
         }
 
         protected void RunPowerShellTest(params string[] scripts)

src/ServiceManagement/Services/Commands.Test/Profile/ProfileClientHelper.cs

@@ -16,7 +16,10 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
+using Hyak.Common;
+using Microsoft.Azure.Subscriptions.Rdfe;
 
 namespace Microsoft.WindowsAzure.Commands.Test.Profile
 {
@@ -31,6 +34,16 @@ public IList<String> ReturnedSubscriptions
             set { this._subscriptions = value; }
         }
 
+        protected override SubscriptionClient WithHandler(ServiceClient<SubscriptionClient> newClient, DelegatingHandler handler)
+        {
+            return newClient as SubscriptionClient;
+        }
+
+        public override SubscriptionClient WithHandler(DelegatingHandler handler)
+        {
+            return this;
+        }
+
         public override Microsoft.Azure.Subscriptions.Rdfe.ISubscriptionOperations Subscriptions
         {
             get { return MockRdfeSubscriptionOperations.Create(this.ReturnedSubscriptions, this.Tenant); }
@@ -128,6 +141,11 @@ public override Azure.Subscriptions.Csm.ITenantOperations Tenants
                 return MockCsmTenantOperations.Create(this.ReturnedTenants);
             }
         }
+
+        public override Azure.Subscriptions.Csm.SubscriptionClient WithHandler(DelegatingHandler handler)
+        {
+            return this;
+        }
     }
 
     public class MockCsmTenantOperations : Microsoft.Azure.Subscriptions.Csm.ITenantOperations