Add test coverage for Properties property

Author: cormacpayne

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

@@ -98,14 +98,14 @@ public void TestMoveResourceFailed()
             ResourcesController.NewInstance.RunPsTest("Test-MoveResourceFailed");
         }
 
-        [Fact(Skip = "Successfully re-recorded, but still failing in playback")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAResourceTest()
         {
             ResourcesController.NewInstance.RunPsTest("Test-SetAResource");
         }
 
-        [Fact(Skip = "Successfully re-recorded, but still failing in playback")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAResourceWithPatchTest()
         {
@@ -133,6 +133,20 @@ public void TestGetResourceWithExpandProperties()
             ResourcesController.NewInstance.RunPsTest("Test-GetResourceExpandProperties");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetResourceByIdAndProperties()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-GetResourceByIdAndProperties");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetResourceByComponentsAndProperties()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-GetResourceByComponentsAndProperties");
+        }
+
         [Fact(Skip = "Zones are disabled for now.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManageResourceWithZones()

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

@@ -471,6 +471,78 @@ function Test-GetResourceExpandProperties
     }
 }
 
+<#
+.SYNOPSIS
+Tests getting a resource by id and its properties
+#>
+function Test-GetResourceByIdAndProperties
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+    $apiversion = "2014-04-01"
+    $resourceType = "Providers.Test/statefulResources"
+
+	try
+	{
+		# Test
+        New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+        $resource = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+        $resourceGet = Get-AzureRmResource -ResourceId $resource.ResourceId
+
+		# Assert
+		Assert-NotNull $resourceGet
+		Assert-AreEqual $resourceGet.Name $rname
+		Assert-AreEqual $resourceGet.ResourceGroupName $rgname
+		Assert-AreEqual $resourceGet.ResourceType $resourceType
+		$properties = $resourceGet.Properties
+		Assert-NotNull $properties
+		Assert-NotNull $properties.key
+		Assert-AreEqual $properties.key "value"
+	}
+	finally
+	{
+		Clean-ResourceGroup $rgname
+	}
+}
+
+<#
+.SYNOPSIS
+Tests getting a resource by its components and its properties
+#>
+function Test-GetResourceByComponentsAndProperties
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+    $apiversion = "2014-04-01"
+    $resourceType = "Providers.Test/statefulResources"
+
+	try
+	{
+		# Test
+        New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+        $resource = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+        $resourceGet = Get-AzureRmResource -Name $rname -ResourceGroupName $rgname -ResourceType $resourceType
+
+		# Assert
+		Assert-NotNull $resourceGet
+		Assert-AreEqual $resourceGet.Name $rname
+		Assert-AreEqual $resourceGet.ResourceGroupName $rgname
+		Assert-AreEqual $resourceGet.ResourceType $resourceType
+		$properties = $resourceGet.Properties
+		Assert-NotNull $properties
+		Assert-NotNull $properties.key
+		Assert-AreEqual $properties.key "value"
+	}
+	finally
+	{
+		Clean-ResourceGroup $rgname
+	}
+}
+
 <#
 .SYNOPSIS
 Tests managing resource with zones.

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

@@ -92,7 +92,7 @@ public void RunPsTest(params string[] scripts)
                 () => scripts,
                 // no custom initializer
                 null,
-                // no custom cleanup 
+                // no custom cleanup
                 null,
                 callingClassType,
                 mockName);
@@ -121,6 +121,7 @@ public void RunPsTestWorkflow(
             d.Add("Microsoft.Resources", null);
             d.Add("Microsoft.Features", null);
             d.Add("Microsoft.Authorization", null);
+            d.Add("Providers.Test", null);
             var providersToIgnore = new Dictionary<string, string>();
             providersToIgnore.Add("Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2016-07-01");
             providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");