Merge pull request #87 from SkillsFundingAgency/DASD-3585_AddStorageQueueMessage

Fix tests

Author: smneal

Tests/AT014.Add-AzureStorageQueueMessage.Tests.ps1

@@ -8,7 +8,19 @@ Describe "Add-AzureStorageQueueMessage Tests" -Tag "Acceptance-ARM" {
     $StorageQueueMessage = "$($Config.classicStorageQueueMessage)$($Config.suffix)"
 
     try {
-        $null = New-AzureRmStorageAccount -ResourceGroupName $ResourceGroupName -Location "West Europe" -Name $StorageAccountName -SkuName Standard_LRS
+        # --- Check if storage account exists in our subscription
+        if ((((Get-Module AzureRM -ListAvailable | Sort-Object { $_.Version.Major } -Descending).Version.Major))[0] -ge 5) {
+            $StorageAccountResource = Get-AzureRmResource -Name $StorageAccountName -ResourceType "Microsoft.Storage/storageAccounts"
+        }
+        else {
+            $StorageAccountResource = Find-AzureRmResource -ResourceNameEquals $StorageAccountName -ResourceType "Microsoft.Storage/storageAccounts"
+        }
+
+        if (!$StorageAccountResource) {
+            "Could not find storage account $StorageAccountName. Create it."
+            New-AzureRmStorageAccount -ResourceGroupName $ResourceGroupName -Location "West Europe" -Name $StorageAccountName -SkuName Standard_LRS
+        }
+
         $StorageAccountKey = (Get-AzureRmStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName)[0].Value
         $StorageAccountContext = New-AzureStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey
         $Queue = New-AzureStorageQueue -Name $StorageQueueName -Context $StorageAccountContext
@@ -22,11 +34,10 @@ Describe "Add-AzureStorageQueueMessage Tests" -Tag "Acceptance-ARM" {
         $Output = $Queue.CloudQueue.GetMessage()
         $Queue.CloudQueue.DeleteMessage($Output)
         $Output.Count | Should Be 1
-        $Output.AsString | Should Be
     }
 
     It "Should complete succesfully and return one output with a specific message" {
-        $Output = .\Add-AzureStorageQueueMessage.ps1 -ResourceGroupName $ResourceGroupName -StorageAccountName $StorageAccountName `
+        $null = .\Add-AzureStorageQueueMessage.ps1 -ResourceGroupName $ResourceGroupName -StorageAccountName $StorageAccountName `
                     -StorageQueueName $StorageQueueName -MessageContent $StorageQueueMessage
         $Output = $Queue.CloudQueue.GetMessage()
         $Queue.CloudQueue.DeleteMessage($Output)