Merge pull request Azure#7314 from vladimir-shcherbakov/test-controller

Test controller as nuget package

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs

@@ -12,48 +12,39 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ResourceManager.Common;
-using Microsoft.Azure.Commands.Resources.Test.ScenarioTests;
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
+using  Microsoft.Azure.Commands.TestFx;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.Profile.Test
 {
-    public class ArgumentCompleterTests : RMTestBase
+    public class ArgumentCompleterTests : TestRunnerBase
     {
-        private XunitTracingInterceptor xunitLogger;
-
-        public ArgumentCompleterTests(ITestOutputHelper output)
+        public ArgumentCompleterTests(ITestOutputHelper output) 
+            : base(output)
         {
-            TestExecutionHelpers.SetUpSessionAndProfile();
-            ResourceManagerProfileProvider.InitializeResourceManagerProfile(true);
-
-            xunitLogger = new XunitTracingInterceptor(output);
         }
 
         [Fact(Skip = "Failure needs investigated. Not returning list of locations.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestLocationCompleter()
         {
-            ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-LocationCompleter");
+            TestRunner.RunTestScript("Test-LocationCompleter");
         }
 
         [Fact(Skip = "Failure needs investigated. Cannot bind argument to parameter 'DifferenceObject' because it is null.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResourceGroupCompleter()
         {
-            ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-ResourceGroupCompleter");
+            TestRunner.RunTestScript("Test-ResourceGroupCompleter");
         }
 
         [Fact(Skip = "AzureRM.Resources.ps1 needs Get-AzureRmResource to be implemented")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResourceIdCompleter()
         {
-            ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-ResourceIdCompleter");
+            TestRunner.RunTestScript("Test-ResourceIdCompleter");
         }
     }
 }

src/ResourceManager/Profile/Commands.Profile.Test/DefaultCmdletTests.cs

@@ -13,34 +13,27 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ResourceManager.Common;
-using Microsoft.Azure.Commands.Resources.Test.ScenarioTests;
 using Microsoft.Azure.Commands.ScenarioTest;
 using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-using System.Threading;
+using Microsoft.Azure.Commands.TestFx;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.Profile.Test
 {
-    public class DefaultCmdletTests : RMTestBase
+    public class DefaultCmdletTests : TestRunnerBase
     {
-        private XunitTracingInterceptor xunitLogger;
-
         public DefaultCmdletTests(ITestOutputHelper output)
+            : base(output)
         {
-            TestExecutionHelpers.SetUpSessionAndProfile();
-            ResourceManagerProfileProvider.InitializeResourceManagerProfile(true);
-
-            xunitLogger = new XunitTracingInterceptor(output);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DefaultResourceGroup()
         {
-            ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-DefaultResourceGroup");
+            TestRunner.RunTestScript("Test-DefaultResourceGroup");
         }
     }
 }