Merge pull request #1 from vivsriaus/AddRGTest

Add RG positional params test, update RM manifest to include RGDO for…
wastoresh · Apr 26, 2016 · c951c29 · c951c29
2 parents a42d12d + 54ac658
commit c951c29
Show file tree

Hide file tree

Showing 5 changed files with 566 additions and 2 deletions.
diff --git a/src/ResourceManager/Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.psd1
@@ -54,11 +54,14 @@ RequiredAssemblies = @()
 ScriptsToProcess = @()  
 
 # Type files (.ps1xml) to be loaded when importing this module  
-TypesToProcess = @()
+TypesToProcess = @(
+	'Microsoft.Azure.Commands.ResourceManager.Cmdlets.Types.ps1xml'
+)
 
 # Format files (.ps1xml) to be loaded when importing this module  
 FormatsToProcess = @(
-	'.\Microsoft.Azure.Commands.Resources.format.ps1xml'
+	'.\Microsoft.Azure.Commands.Resources.format.ps1xml',
+	'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml'
 )
 
 # Modules to import as nested modules of the module specified in ModuleToProcess  

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj
@@ -399,6 +399,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests\TestRemoveNonExistingResourceGroup.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests\TestResourceGroupWithPositionalParams.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests\TestUpdatesExistingResourceGroup.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.cs
@@ -76,6 +76,13 @@ public void TestExportResourceGroup()
             ResourcesController.NewInstance.RunPsTest("Test-ExportResourceGroup");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestResourceGroupWithPositionalParams()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-ResourceGroupWithPositionalParams");
+        }
+
         [Fact (Skip = "TODO: Fix the broken test.")]
         public void TestAzureTagsEndToEnd()
         {

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1 b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1
@@ -350,4 +350,34 @@ function Test-ExportResourceGroup
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Tests resource group new, get and remove using positional parameters.
+#>
+function Test-ResourceGroupWithPositionalParams
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $location = "West US"
+
+    try
+    {
+        $ErrorActionPreference = "SilentlyContinue"
+        $Error.Clear()
+        # Test
+        $actual = New-AzureRmResourceGroup $rgname $location
+        $expected = Get-AzureRmResourceGroup $rgname
+
+        # Assert
+        Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
+
+        #Test
+        Remove-AzureRmResourceGroup $rgname -Force
+    }
+    catch
+    {
+        Assert-True { $Error[0].Contains("Provided resource group does not exist.") }
+    }
 }