Azure Analysis Services: test resource RP location is moved to a function for further improvements

Author: Igor Uzhviev

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs

@@ -28,21 +28,21 @@ public AsTests(Xunit.Abstractions.ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAnalysisServicesServer()
         {
-            NewInstance.RunPsTest(string.Format("Test-AnalysisServicesServer -location '{0}'", AsTestsBase.resourceGroupLocation));
+            NewInstance.RunPsTest("Test-AnalysisServicesServer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAnalysisServicesServerScaleUpDown()
         {
-            NewInstance.RunPsTest(string.Format("Test-AnalysisServicesServerScaleUpDown -location '{0}'", AsTestsBase.resourceGroupLocation));
+            NewInstance.RunPsTest("Test-AnalysisServicesServerScaleUpDown");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNegativeAnalysisServicesServer()
         {
-            NewInstance.RunPsTest(string.Format("Test-NegativeAnalysisServicesServer -location '{0}'", AsTestsBase.resourceGroupLocation));
+            NewInstance.RunPsTest("Test-NegativeAnalysisServicesServer");
         }
 
         [Fact]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1

@@ -4,14 +4,10 @@ Tests Analysis Services server lifecycle (Create, Update, Get, List, Delete).
 #>
 function Test-AnalysisServicesServer
 {
-    param
-	(
-		$location = "West US"
-	)
-	
 	try
 	{  
 		# Creating server
+		$location = Get-Location
 		$resourceGroupName = Get-ResourceGroupName
 		$serverName = Get-AnalysisServicesServerName
 		New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
@@ -129,14 +125,10 @@ Tests scale up and down of Analysis Services server (B1 -> S2 -> S1).
 #>
 function Test-AnalysisServicesServerScaleUpDown
 {
-    param
-	(
-		$location = "West US"
-	)
-	
 	try
 	{  
 		# Creating server
+		$location = Get-Location
 		$resourceGroupName = Get-ResourceGroupName
 		$serverName = Get-AnalysisServicesServerName
 		New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
@@ -188,16 +180,15 @@ Tests Analysis Services server lifecycle  Failure scenarios (Create, Update, Get
 #>
 function Test-NegativeAnalysisServicesServer
 {
-
     param
 	(
-		$location = "West US",
 		$fakeserverName = "psfakeservertest"
 	)
 
 	try
 	{
 		# Creating Account
+		$location = Get-Location
 		$resourceGroupName = Get-ResourceGroupName
 		$serverName = Get-AnalysisServicesServerName
 		New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
@@ -246,12 +237,12 @@ function Test-AnalysisServicesServerRestart
 {
     param
 	(
-		$rolloutEnvironment = $env.ASAZURE_TEST_ROLLOUT,
-		$location = "West US"
+		$rolloutEnvironment = $env.ASAZURE_TEST_ROLLOUT
 	)
 	try
 	{
 		# Creating server
+		$location = Get-Location
 		$resourceGroupName = Get-ResourceGroupName
 		$serverName = Get-AnalysisServicesServerName
 		New-AzureRmResourceGroup -Name $resourceGroupName -Location $location

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTestsBase.cs

@@ -40,7 +40,6 @@ public class AsTestsBase : RMTestBase
         private LegacyTest.CSMTestEnvironmentFactory csmTestFactory;
         private EnvironmentSetupHelper helper;
         private const string AuthorizationApiVersion = "2014-07-01-preview";
-        internal const string resourceGroupLocation = "West US";
 
         public ResourceManagementClient ResourceManagementClient { get; private set; }
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/Common.ps1

@@ -30,6 +30,16 @@ function Get-ResourceGroupName
     return getAssetName
 }
 
+<#
+.SYNOPSIS
+Gets a location for testing.
+#>
+function Get-Location
+{
+	# TODO: should be implemented via Get-AzureRmResourceProvider 
+	return "West US"
+}
+
 <#
 .SYNOPSIS
 Executes a cmdlet and enables ignoring of errors if desired