Test fixes and recordings

Author: Xynoclafe

src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCmdletBase.cs

@@ -41,7 +41,7 @@ protected Hashtable GetParameterObject(string parameterFile)
         {
             var parameters = new Hashtable();
             string templateParameterFilePath = this.ResolvePath(parameterFile);
-            if (parameterFile != null && FileUtilities.DataStore.FileExists(parameterFile))
+            if (parameterFile != null && FileUtilities.DataStore.FileExists(templateParameterFilePath))
             {
                 var parametersFromFile = TemplateUtility.ParseTemplateParameterFileContents(templateParameterFilePath);
                 parametersFromFile.ForEach(dp =>

src/Resources/Resources.Test/ScenarioTests/DeploymentStackTests.ps1

@@ -29,11 +29,11 @@ function Test-GetResourceGroupDeploymentStack
 		# Prepare 
 		New-AzResourceGroup -Name $rgname -Location $rglocation
 
-		$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplate.json -ParameterFile simpleTemplateParams.json
+		$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json
 		$resourceId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deploymentStacks/$rname"
 
 		# Test - GetByNameAndResourceGroup
-		$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -Name $rname 
+		$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -StackName $rname 
 
 		# Assert
 		Assert-NotNull $getByNameAndResourceGroup
@@ -78,33 +78,33 @@ function Test-GetResourceGroupDeploymentStackSnapshot
 		$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplate.json -ParameterFile simpleTemplateParams.json
 		$resourceId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deploymentStacks/$rname"
 
-		$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -Name $rname 
+		$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -StackName $rname 
 		$provisioningState = $getByNameAndResourceGroup.provisioningState
 
-		while ($provisioningState == "initializing" or $provisioningState == "failed"){
-			$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -Name $rname 
-			$provisioningState = $$getByNameAndResourceGroup.provisioningState
+		while ($provisioningState -ne "succeeded" -and $provisioningState -ne "failed"){
+			$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -StackName $rname 
+			$provisioningState = $getByNameAndResourceGroup.provisioningState
 		}
 
-		$resourceId = $getByNameAndResourceGroup.snapshotId
-		$snapshotName = ResourceIdUtility.GetResourceName($resourceId).Split('/')[0];
+		#Assert
+		Assert-AreEqual $provisioningState "succeeded"
+
+		$resourceId = $getByNameAndResourceGroup.SnapshotId
+		$snapshotName = $resourceId.Split("/")[-1]
 
 		#Test - GetByIdAndSnapshotName
-		$getByIdAndSnapshotName = Get-AzResourceGroupDeploymentStackSnapshot -ResourceId $resourceId -SnapshotName $snapshotName
+		$getByIdAndSnapshotName = Get-AzResourceGroupDeploymentStackSnapshot -ResourceId $resourceId
 
 		#Assert
-		Assert-AreEqual $provisioningState "succeeded"
 		Assert-NotNull $getByIdAndSnapshotName
 
-		#Test - GetByResourceGroupNameAndStackName
-		Assert-AreEqual $provisioningState "succeeded"
+		#Test - ListSnapshots
 		$getByResourceGroupNameAndStackName = Get-AzResourceGroupDeploymentStackSnapshot -ResourceGroupName $rgname -StackName $rname
 
 		#Assert
 		Assert-NotNull $getByResourceGroupNameAndStackName
 
 		#Test - GetByResourceGroupNameAndStackNameAndSnapshotName
-		Assert-AreEqual $provisioningState "succeeded"
 		$getByResourceGroupNameAndStackName = Get-AzResourceGroupDeploymentStackSnapshot -ResourceGroupName $rgname -StackName $rname -SnapshotName $snapshotName
 
 		#Assert
@@ -117,7 +117,6 @@ function Test-GetResourceGroupDeploymentStackSnapshot
     }
 }
 
-
 <#
 .SYNOPSIS
 Tests GET operation on deploymentStacks at the Subscription scope