Merge pull request Azure#3101 from diwudd/wud/consistsupport

Fixing some piping issue. Azure#2996

Author: markcowl

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs

@@ -168,6 +168,11 @@ public override void ExecuteCmdlet()
         {
             try
             {
+                if (this.cancellationSource == null)
+                {
+                    this.cancellationSource = new CancellationTokenSource();
+                }
+
                 base.ExecuteCmdlet();
                 this.OnProcessRecord();
             }

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -581,6 +581,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestMoveResourceFailed.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestRemoveAResourceTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestRemoveASetOfResourcesTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestSetAResourceTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

@@ -139,5 +139,19 @@ public void TestManageResourceWithZones()
         {
             ResourcesController.NewInstance.RunPsTest("Test-ManageResourceWithZones");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRemoveAResourceTest()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-RemoveAResource");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRemoveASetOfResourcesTest()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-RemoveASetOfResources");
+        }
     }
 }

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

@@ -445,4 +445,63 @@ function Test-ManageResourceWithZones
 	Assert-NotNull $resourceGet
 	Assert-AreEqual $resourceGet.Zones.Length 1
 	Assert-AreEqual $resourceGet.Zones[0] "3"
+}
+
+<#
+.SYNOPSIS
+Tests removing a resource.
+#>
+function Test-RemoveAResource
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = "testname"
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2014-04-01"
+	$resourceType = "Providers.Test/statefulResources"
+
+	# Test
+	New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+	$actual = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
+	Assert-NotNull $expected
+	Assert-AreEqual $actual.ResourceId $expected[0].ResourceId
+
+	Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname | Remove-AzureRmResource -Force
+	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
+	Assert-Null $expected
+}
+
+<#
+.SYNOPSIS
+Tests removing a set of resources.
+#>
+function Test-RemoveASetOfResources
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = "testname"
+	$rname2 = "test2name"
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2014-04-01"
+	$resourceType = "Providers.Test/statefulResources"
+
+	# Test
+	New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+	$actual = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
+	Assert-NotNull $expected
+	Assert-AreEqual $actual.ResourceId $expected[0].ResourceId
+	
+	$expected = Find-AzureRmResource -ResourceType $resourceType -ResourceGroupNameContains $rgName
+	Assert-NotNull $expected
+	Assert-AreEqual $actual.ResourceId $expected[0].ResourceId
+
+	New-AzureRmResource -Name $rname2 -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
+	Assert-AreEqual 2 @($expected).Count
+
+	Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname | Remove-AzureRmResource -Force
+	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
+	Assert-Null $expected
 }