Re-record tests

Author: matthchr

src/Batch/Batch.Test/ScenarioTests/BatchApplicationPackageTests.ps1

@@ -24,9 +24,12 @@ function Test-UploadApplicationPackage
     $context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
 
     $addAppPack = New-AzBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationName $applicationName -ApplicationVersion $applicationVersion -format "zip" -ActivateOnly
+    $subId = $context.Subscription
+    $resourceGroup = $context.ResourceGroupName
+    $batchAccountName = $context.AccountName
 
-    Assert-AreEqual $applicationName $addAppPack.Id
-    Assert-AreEqual $applicationVersion $addAppPack.Version
+    Assert-AreEqual "/subscriptions/$subId/resourceGroups/$resourceGroup/providers/Microsoft.Batch/batchAccounts/$batchAccountName/applications/$applicationName/versions/$applicationVersion" $addAppPack.Id
+    Assert-AreEqual $applicationVersion $addAppPack.Name
 }
 
 <#
@@ -71,7 +74,7 @@ function Test-CreatePoolWithApplicationPackage
         Assert-AreEqual $applicationVersion $addAppPack.Name
 
         $apr1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSApplicationPackageReference
-        $apr1.ApplicationName = $applicationName
+        $apr1.ApplicationId = $applicationName
         $apr1.Version = $applicationVersion
         $apr = [Microsoft.Azure.Commands.Batch.Models.PSApplicationPackageReference[]]$apr1
 
@@ -108,7 +111,7 @@ function Test-UpdatePoolWithApplicationPackage
 
     # update pool with application package references
     $apr1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSApplicationPackageReference
-    $apr1.ApplicationName = $applicationName
+    $apr1.ApplicationId = $applicationName
     $apr1.Version = $applicationVersion
     $apr = [Microsoft.Azure.Commands.Batch.Models.PSApplicationPackageReference[]]$apr1
 

src/Batch/Batch.Test/ScenarioTests/BatchController.cs

@@ -30,7 +30,11 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
 {
     public class BatchController
     {
-        internal static string BatchAccount, BatchAccountKey, BatchAccountUrl, BatchResourceGroup;
+        internal static string BatchAccount;
+        internal static string BatchAccountKey;
+        internal static string BatchAccountUrl;
+        internal static string BatchResourceGroup;
+        internal static string Subscription;
 
         private readonly EnvironmentSetupHelper _helper;
 
@@ -154,8 +158,10 @@ private BatchManagementClient GetBatchManagementClient(MockContext context)
                     BatchResourceGroup = HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountResourceGroup];
                 }
             }
+            var result = context.GetServiceClient<BatchManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
+            Subscription = result.SubscriptionId;
 
-            return context.GetServiceClient<BatchManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
+            return result;
         }
     }
 }

src/Batch/Batch.Test/ScenarioTests/ScenarioTestContext.cs

@@ -28,6 +28,7 @@ public ScenarioTestContext() : base(null)
             this.PrimaryAccountKey = BatchController.BatchAccountKey;
             this.TaskTenantUrl = BatchController.BatchAccountUrl;
             this.ResourceGroupName = BatchController.BatchResourceGroup;
+            this.Subscription = BatchController.Subscription;
         }
 
         protected override BatchServiceClient CreateBatchRestClient(string url, ServiceClientCredentials credentials, DelegatingHandler handler = default(DelegatingHandler))

src/Batch/Batch.Test/ScenarioTests/TaskTests.ps1

@@ -100,12 +100,7 @@ function Test-CreateTaskCollection
     $file = New-AzBatchResourceFile -HttpUrl "https://testacct.blob.core.windows.net/" -FilePath "file1"
     $resourceFiles.Add($file)
 
-    $envSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting]
-    $env1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting("env1", "value1")
-    $env2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting("env2", "value2")
-    $envSettings.Add($env1)
-    $envSettings.Add($env2)
-
+    $envSettings = @{ env1 = "value1"; env2 = "value2" }
     $numInstances = 3
     $multiInstanceSettings = New-Object Microsoft.Azure.Commands.Batch.Models.PSMultiInstanceSettings -ArgumentList @("cmd /c echo coordinating", $numInstances)
     $coordinationCommandLine = $multiInstanceSettings.CoordinationCommandLine