Remove ExecuteCmdlet from production code

Author: ogail

src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj

@@ -130,6 +130,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="PSCmdletExtensions.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="EnvironmentSetupHelper.cs" />
     <Compile Include="Mocks\MockAccessToken.cs" />

src/Common/Commands.ScenarioTests.Common/PSCmdletExtensions.cs

@@ -0,0 +1,48 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Management.Automation;
+using System.Reflection;
+
+namespace Microsoft.WindowsAzure.Commands.ScenarioTest
+{
+    public static class PSCmdletExtensions
+    {
+        private static MethodInfo GetProtectedMethod(string name)
+        {
+            MethodInfo m = typeof(PSCmdlet).GetMethod(
+                name,
+                BindingFlags.Instance | BindingFlags.NonPublic,
+                Type.DefaultBinder,
+                new Type[] { },
+                null);
+
+            return m;
+        }
+
+        public static void ExecuteCmdlet(this PSCmdlet cmdlet)
+        {
+            try
+            {
+                GetProtectedMethod("ProcessRecord").Invoke(cmdlet, new object[] { });
+            }
+            catch (TargetInvocationException e)
+            {
+                throw e.InnerException;
+            }
+        }
+    }
+}

src/ResourceManager/AzureBatch/Commands.Batch/BatchCmdletBase.cs

@@ -179,13 +179,5 @@ private void HandleBatchException(BatchException ex)
                 }
             }
         }
-
-        /// <summary>
-        /// This is added for tests only, should move out from this pattern and rely of ProcessRecord.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryGatewayTests.cs

@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.DataFactories.Test
 {
     public class DataFactoryGatewayTests : DataFactoriesScenarioTestsBase
     {
-        [Fact]
+        [Fact(Skip = "test takes too long (more than 5 sec)")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNonExistingDataFactoryGateway()
         {
@@ -32,7 +32,7 @@ public void TestCreateDataFactoryGateway()
             RunPowerShellTest("Test-DataFactoryGateway");
         }
 
-        [Fact]
+        [Fact(Skip = "test takes too long (more than 5 sec)")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateDataFactoryGatewayWithDataFactoryParameter()
         {

src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryBaseCmdlet.cs

@@ -89,13 +89,5 @@ protected string ResolveResourceName(string rawJsonContent, string nameFromCmdle
 
             return resolvedResourceName;
         }
-
-        /// <summary>
-        /// This is added for tests purpose only, should step down in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/Dns/Commands.Dns.Test/UnitTests/GetAzureDnsRecordSetTests.cs

@@ -16,9 +16,10 @@ namespace Microsoft.Azure.Commands.Dns.Test.UnitTests
 {
     using System.Management.Automation;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
+    using WindowsAzure.Commands.Test.Utilities.Common;
     using Xunit;
 
-    public class GetAzureDnsRecordSetTests
+    public class GetAzureDnsRecordSetTests : RMTestBase
     {
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/ResourceManager/Dns/Commands.Dns.Test/UnitTests/GetAzureDnsZoneTests.cs

@@ -16,9 +16,10 @@ namespace Microsoft.Azure.Commands.Dns.Test.UnitTests
 {
     using System.Management.Automation;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
+    using WindowsAzure.Commands.Test.Utilities.Common;
     using Xunit;
 
-    public class GetAzureDnsZoneTests
+    public class GetAzureDnsZoneTests : RMTestBase
     {
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/ResourceManager/Dns/Commands.Dns/Models/DnsBaseCmdlet.cs

@@ -34,13 +34,5 @@ public DnsClient DnsClient
 
             set { dnsClient = value; }
         }
-
-        /// <summary>
-        /// Added for tests only, should be removed in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/HDInsight/Commands.HDInsight.Test/HDInsightTestBase.cs

@@ -17,11 +17,12 @@
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Moq;
 
 namespace Microsoft.Azure.Commands.HDInsight.Test
 {
-    public class HDInsightTestBase
+    public class HDInsightTestBase : RMTestBase
     {
         protected const string ClusterName = "hdicluster";
         protected const string ResourceGroupName = "hdi-rg1";

src/ResourceManager/HDInsight/Commands.HDInsight/HDInsightCmdletBase.cs

@@ -83,13 +83,5 @@ protected string GetClusterConnection(string resourceGroupName, string clusterNa
             }
             return httpEndpoint;
         }
-
-        /// <summary>
-        /// Added for test code only, should be removed in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/Insights/Commands.Insights.Test/Utilities.cs

@@ -24,6 +24,7 @@
 using Microsoft.Azure.Management.Insights.Models;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Insights.Test
 {

src/ResourceManager/Insights/Commands.Insights/Autoscale/NewAutoscaleProfileCommand.cs

@@ -197,13 +197,5 @@ private RecurrentSchedule CreateRecurrentSchedule()
                 TimeZone = this.ScheduleTimeZone,
             };
         }
-
-        /// <summary>
-        /// Added for tests only, should be removed in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/Insights/Commands.Insights/Autoscale/NewAutoscaleRuleCommand.cs

@@ -162,13 +162,5 @@ public ScaleRule CreateSettingRule()
                 ScaleAction = action,
             };
         }
-
-        /// <summary>
-        /// Added for tests only, should be removed in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/Insights/Commands.Insights/InsightsCmdletBase.cs

@@ -42,13 +42,5 @@ protected override void ProcessRecord()
                 throw ex.Flatten().InnerException;
             }
         }
-
-        /// <summary>
-        /// Added for tests only, should be removed in the future.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCmdletBase.cs

@@ -27,14 +27,6 @@ public KeyVaultCmdletBase()
         {        
         }
 
-        /// <summary>
-        /// Shim method for backward compatibility.  All cmdlets should implement ProcessRecord directly
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
-
         internal IKeyVaultDataServiceClient DataServiceClient
         {
             get

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultManagementCmdletBase.cs

@@ -37,14 +37,6 @@ public KeyVaultManagementCmdletBase()
 
         }
 
-        /// <summary>
-        /// Shim method for backward compatibility.  All cmdlets should implement ProcessRecord directly
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
-
         private PSKeyVaultModels.VaultManagementClient _keyVaultManagementClient;
         public PSKeyVaultModels.VaultManagementClient KeyVaultManagementClient
         {

src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/RemoveAzureResourceGroupDeploymentCommandTests.cs

@@ -17,6 +17,7 @@
 using Microsoft.Azure.Commands.Resources.ResourceGroups;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Resources
 {

src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/StopAzureResourceGroupDeploymentCommandTests.cs

@@ -17,6 +17,7 @@
 using Microsoft.Azure.Commands.Resources.ResourceGroups;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Resources
 {

src/ResourceManager/Resources/Commands.Resources.Test/Templates/GetAzureResourceGroupGalleryTemplateCommandTests.cs

@@ -19,6 +19,7 @@
 using Microsoft.Azure.Commands.Resources.Templates;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Resources
 {

src/ResourceManager/Resources/Commands.Resources.Test/Templates/SaveAzureResourceGroupGalleryTemplateCommandTests.cs

@@ -19,6 +19,7 @@
 using Microsoft.Azure.Commands.Resources.Templates;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Resources
 {

src/ResourceManager/Resources/Commands.Resources.Test/Templates/TestAzureResourceGroupTemplateCommandTests.cs

@@ -19,6 +19,7 @@
 using Microsoft.Azure.Management.Resources.Models;
 using Moq;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Resources
 {

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs

@@ -108,13 +108,5 @@ public virtual string DetermineParameterSetName()
         {
             return this.ParameterSetName;
         }
-
-        /// <summary>
-        /// This is present for making tests compile, ideally this pattern should go away.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }

src/ResourceManager/Resources/Commands.Resources/ProviderFeatures/AzureProviderFeatureCmdletsBase.cs

@@ -53,13 +53,5 @@ public virtual string DetermineParameterSetName()
         {
             return this.ParameterSetName;
         }
-
-        /// <summary>
-        /// This is present for making tests compile, ideally this pattern should go away.
-        /// </summary>
-        public void ExecuteCmdlet()
-        {
-            ProcessRecord();
-        }
     }
 }