Incorporating feedback from partner team

AditTulasi · AditTulasi · commit ffbf68864ff4 · 2016-04-11T18:26:35.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -25,7 +25,7 @@
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;
-
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
@@ -838,7 +838,7 @@ private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink
                     var response = HydraAdapter.GetRefreshContainerOperationResultByURL(operationResultLink);
                     status = response.StatusCode;
 
-                    Thread.Sleep(checkFrequency);
+                    TestMockSupport.Delay(checkFrequency);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesContainerBase))]
     public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]
@@ -57,7 +57,7 @@ public override void ExecuteCmdlet()
                         containerModels = containerModels.Where(x => x.Name == this.Name).ToList();
                     }
                 }
-                WriteObject(containerModels);
+                WriteObject(containerModels, enumerateCollection: true);
             });
         }
     }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(AzureRmRecoveryServicesContainerBase))]
     public class GetAzureRmRecoveryServicesContainer : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.ContainerType)]
@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()
                 }
                 else
                 {
-                    WriteObject(containerModels);
+                    WriteObject(containerModels, enumerateCollection: true);
                 }
             });
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Item/GetAzureRmRecoveryServicesItem.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Item/GetAzureRmRecoveryServicesItem.cs
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of items
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesItem"), OutputType(typeof(List<AzureRmRecoveryServicesItemBase>), typeof(AzureRmRecoveryServicesItemBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesItem"), OutputType(typeof(AzureRmRecoveryServicesItemBase))]
     public class GetAzureRmRecoveryServicesItem : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Item.Container)]
@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()
                 }
                 else
                 {
-                    WriteObject(itemModels);
+                    WriteObject(itemModels, enumerateCollection: true);
                 }
             });
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of jobs
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
     public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter, Position = 1)]
@@ -159,7 +159,7 @@ public override void ExecuteCmdlet()
                 WriteDebug("Number of jobs fetched: " + result.Count);
                 if (resultCount != 1)
                 {
-                    WriteObject(result);
+                    WriteObject(result, enumerateCollection: true);
                 }
                 else
                 {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/StopAzureRmRecoveryServicesJob.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/StopAzureRmRecoveryServicesJob.cs
@@ -20,6 +20,7 @@
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -56,7 +57,7 @@ public override void ExecuteCmdlet()
 
                 while (cancelStatus.StatusCode == HttpStatusCode.Accepted)
                 {
-                    Thread.Sleep(15 * 1000);
+                    TestMockSupport.Delay(15 * 1000);
                     cancelStatus = HydraAdapter.GetJobOperationStatus(JobId, opId);
                 }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs
@@ -19,10 +19,11 @@
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
-    [Cmdlet("Wait", "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
+    [Cmdlet("Wait", "AzureRmRecoveryServicesJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
     public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter, ValueFromPipeline = true, Position = 1)]
@@ -103,7 +104,7 @@ public override void ExecuteCmdlet()
                     }
 
                     // sleep for 30 seconds before checking again
-                    Thread.Sleep(30 * 1000);
+                    TestMockSupport.Delay(30 * 1000);
                 }
 
                 if (finalJobs.Count == 1)
@@ -112,7 +113,7 @@ public override void ExecuteCmdlet()
                 }
                 else
                 {
-                    WriteObject(finalJobs);
+                    WriteObject(finalJobs, enumerateCollection: true);
                 }
             });
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// Get list of protection policies
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupProtectionPolicy", DefaultParameterSetName = NoParamSet), 
-            OutputType(typeof(List<AzureRmRecoveryServicesBackupPolicyBase>), typeof(AzureRmRecoveryServicesBackupPolicyBase))]
+            OutputType(typeof(AzureRmRecoveryServicesBackupPolicyBase))]
     public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
     {
         protected const string PolicyNameParamSet = "PolicyNameParamSet";
@@ -131,8 +131,8 @@ public override void ExecuteCmdlet()
                    WriteDebug("Successfully got response from service");
 
                    policyList = ConversionHelpers.GetPolicyModelList(respList);
-                   WriteObject(policyList);
-               }               
+                   WriteObject(policyList, enumerateCollection: true);
+               }
            });
         }
     }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/RecoveryPoint/GetAzureRMRecoveryServicesRecoveryPoint.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/RecoveryPoint/GetAzureRMRecoveryServicesRecoveryPoint.cs
@@ -24,7 +24,7 @@
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRMRecoveryServicesRecoveryPoint"), OutputType(typeof(List<AzureRmRecoveryServicesRecoveryPointBase>), typeof(AzureRmRecoveryServicesRecoveryPointBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRMRecoveryServicesRecoveryPoint"), OutputType(typeof(AzureRmRecoveryServicesRecoveryPointBase))]
     public class GetAzureRMRecoveryServicesRecoveryPoint : RecoveryServicesBackupCmdletBase
     {
         internal const string DateTimeFilterParameterSet = "DateTimeFilter";
@@ -81,7 +81,7 @@ public override void ExecuteCmdlet()
                     }
                     else
                     {
-                        WriteObject(rpList);
+                        WriteObject(rpList, enumerateCollection: true);
                     }
                 }
                 else if (this.ParameterSetName == RecoveryPointIdParameterSet)
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Restore/RestoreAzureRMRecoveryServicesBackupItem.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Restore/RestoreAzureRMRecoveryServicesBackupItem.cs
@@ -26,6 +26,7 @@
 using ResourcesNS = Microsoft.Azure.Management.Resources;
 using Newtonsoft.Json.Linq;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -99,7 +100,7 @@ public override void ExecuteCmdlet()
                 {
                     WriteDebug(String.Format("Restore inProgress"));
                     response = HydraAdapter.GetProtectedItemOperationStatusByURL(jobResponse.AzureAsyncOperation);
-                    System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
+                    TestMockSupport.Delay(TimeSpan.FromSeconds(5));
                 }
 
                 if (response.OperationStatus.Status == "Completed")
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs
@@ -30,6 +30,7 @@
 using System.Threading;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -154,7 +155,7 @@ public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink(
             while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())
             {
                 WriteDebug("Tracking operation completion using status link: " + statusUrlLink);
-                Thread.Sleep(_defaultSleepForOperationTracking * 1000);
+                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 response = hydraFunc(statusUrlLink);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
`26`	`26`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;`
`27`	`27`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;`
`28`		`-`
	`28`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`29`	`29`
`30`	`30`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel`
`31`	`31`	`{`
`@@ -838,7 +838,7 @@ private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink`
`838`	`838`	`var response = HydraAdapter.GetRefreshContainerOperationResultByURL(operationResultLink);`
`839`	`839`	`status = response.StatusCode;`
`840`	`840`
`841`		`- Thread.Sleep(checkFrequency);`
	`841`	`+ TestMockSupport.Delay(checkFrequency);`
`842`	`842`	`}`
`843`	`843`	`catch (Exception ex)`
`844`	`844`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Get list of containers`
`29`	`29`	`/// </summary>`
`30`		`- [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]`
	`30`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesContainerBase))]`
`31`	`31`	`public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase`
`32`	`32`	`{`
`33`	`33`	`[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]`
`@@ -57,7 +57,7 @@ public override void ExecuteCmdlet()`
`57`	`57`	`containerModels = containerModels.Where(x => x.Name == this.Name).ToList();`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- WriteObject(containerModels);`
	`60`	`+ WriteObject(containerModels, enumerateCollection: true);`
`61`	`61`	`});`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`26`	`26`	`/// <summary>`
`27`	`27`	`/// Get list of items`
`28`	`28`	`/// </summary>`
`29`		`- [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesItem"), OutputType(typeof(List<AzureRmRecoveryServicesItemBase>), typeof(AzureRmRecoveryServicesItemBase))]`
	`29`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesItem"), OutputType(typeof(AzureRmRecoveryServicesItemBase))]`
`30`	`30`	`public class GetAzureRmRecoveryServicesItem : RecoveryServicesBackupCmdletBase`
`31`	`31`	`{`
`32`	`32`	`[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Item.Container)]`
`@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()`
`74`	`74`	`}`
`75`	`75`	`else`
`76`	`76`	`{`
`77`		`- WriteObject(itemModels);`
	`77`	`+ WriteObject(itemModels, enumerateCollection: true);`
`78`	`78`	`}`
`79`	`79`	`});`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Get list of jobs`
`26`	`26`	`/// </summary>`
`27`		`- [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]`
	`27`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]`
`28`	`28`	`public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase`
`29`	`29`	`{`
`30`	`30`	`[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter, Position = 1)]`
`@@ -159,7 +159,7 @@ public override void ExecuteCmdlet()`
`159`	`159`	`WriteDebug("Number of jobs fetched: " + result.Count);`
`160`	`160`	`if (resultCount != 1)`
`161`	`161`	`{`
`162`		`- WriteObject(result);`
	`162`	`+ WriteObject(result, enumerateCollection: true);`
`163`	`163`	`}`
`164`	`164`	`else`
`165`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
`21`	`21`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;`
`22`	`22`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;`
	`23`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`23`	`24`
`24`	`25`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`25`	`26`	`{`
`@@ -56,7 +57,7 @@ public override void ExecuteCmdlet()`
`56`	`57`
`57`	`58`	`while (cancelStatus.StatusCode == HttpStatusCode.Accepted)`
`58`	`59`	`{`
`59`		`- Thread.Sleep(15 * 1000);`
	`60`	`+ TestMockSupport.Delay(15 * 1000);`
`60`	`61`	`cancelStatus = HydraAdapter.GetJobOperationStatus(JobId, opId);`
`61`	`62`	`}`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,11 @@`
`19`	`19`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
`20`	`20`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;`
`21`	`21`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;`
	`22`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`22`	`23`
`23`	`24`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`24`	`25`	`{`
`25`		`- [Cmdlet("Wait", "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]`
	`26`	`+ [Cmdlet("Wait", "AzureRmRecoveryServicesJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]`
`26`	`27`	`public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase`
`27`	`28`	`{`
`28`	`29`	`[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter, ValueFromPipeline = true, Position = 1)]`
`@@ -103,7 +104,7 @@ public override void ExecuteCmdlet()`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`// sleep for 30 seconds before checking again`
`106`		`- Thread.Sleep(30 * 1000);`
	`107`	`+ TestMockSupport.Delay(30 * 1000);`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`if (finalJobs.Count == 1)`
`@@ -112,7 +113,7 @@ public override void ExecuteCmdlet()`
`112`	`113`	`}`
`113`	`114`	`else`
`114`	`115`	`{`
`115`		`- WriteObject(finalJobs);`
	`116`	`+ WriteObject(finalJobs, enumerateCollection: true);`
`116`	`117`	`}`
`117`	`118`	`});`
`118`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`30`	`30`	`/// Get list of protection policies`
`31`	`31`	`/// </summary>`
`32`	`32`	`[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupProtectionPolicy", DefaultParameterSetName = NoParamSet),`
`33`		`- OutputType(typeof(List<AzureRmRecoveryServicesBackupPolicyBase>), typeof(AzureRmRecoveryServicesBackupPolicyBase))]`
	`33`	`+ OutputType(typeof(AzureRmRecoveryServicesBackupPolicyBase))]`
`34`	`34`	`public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase`
`35`	`35`	`{`
`36`	`36`	`protected const string PolicyNameParamSet = "PolicyNameParamSet";`
`@@ -131,8 +131,8 @@ public override void ExecuteCmdlet()`
`131`	`131`	`WriteDebug("Successfully got response from service");`
`132`	`132`
`133`	`133`	`policyList = ConversionHelpers.GetPolicyModelList(respList);`
`134`		`- WriteObject(policyList);`
`135`		`- }`
	`134`	`+ WriteObject(policyList, enumerateCollection: true);`
	`135`	`+ }`
`136`	`136`	`});`
`137`	`137`	`}`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`26`	`26`	`{`
`27`		`- [Cmdlet(VerbsCommon.Get, "AzureRMRecoveryServicesRecoveryPoint"), OutputType(typeof(List<AzureRmRecoveryServicesRecoveryPointBase>), typeof(AzureRmRecoveryServicesRecoveryPointBase))]`
	`27`	`+ [Cmdlet(VerbsCommon.Get, "AzureRMRecoveryServicesRecoveryPoint"), OutputType(typeof(AzureRmRecoveryServicesRecoveryPointBase))]`
`28`	`28`	`public class GetAzureRMRecoveryServicesRecoveryPoint : RecoveryServicesBackupCmdletBase`
`29`	`29`	`{`
`30`	`30`	`internal const string DateTimeFilterParameterSet = "DateTimeFilter";`
`@@ -81,7 +81,7 @@ public override void ExecuteCmdlet()`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`84`		`- WriteObject(rpList);`
	`84`	`+ WriteObject(rpList, enumerateCollection: true);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`else if (this.ParameterSetName == RecoveryPointIdParameterSet)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`using ResourcesNS = Microsoft.Azure.Management.Resources;`
`27`	`27`	`using Newtonsoft.Json.Linq;`
`28`	`28`	`using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;`
	`29`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`29`	`30`
`30`	`31`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`31`	`32`	`{`
`@@ -99,7 +100,7 @@ public override void ExecuteCmdlet()`
`99`	`100`	`{`
`100`	`101`	`WriteDebug(String.Format("Restore inProgress"));`
`101`	`102`	`response = HydraAdapter.GetProtectedItemOperationStatusByURL(jobResponse.AzureAsyncOperation);`
`102`		`- System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));`
	`103`	`+ TestMockSupport.Delay(TimeSpan.FromSeconds(5));`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`if (response.OperationStatus.Status == "Completed")`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`using System.Threading;`
`31`	`31`	`using Microsoft.Azure.Commands.Common.Authentication;`
`32`	`32`	`using Microsoft.Azure.Commands.Common.Authentication.Models;`
	`33`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`33`	`34`
`34`	`35`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`35`	`36`	`{`
`@@ -154,7 +155,7 @@ public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink(`
`154`	`155`	`while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())`
`155`	`156`	`{`
`156`	`157`	`WriteDebug("Tracking operation completion using status link: " + statusUrlLink);`
`157`		`- Thread.Sleep(_defaultSleepForOperationTracking * 1000);`
	`158`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`158`	`159`	`response = hydraFunc(statusUrlLink);`
`159`	`160`	`}`
`160`	`161`