added resource group to batch controller. This was done to use so we bring an account with auto storage enabled. Re did recordings

Author: matthew-rollitt

src/ResourceManager/AzureBatch/Commands.Batch.Test/EmptyPagedEnumerable.cs

@@ -16,6 +16,7 @@
 
 using Microsoft.Azure.Batch;
 using Microsoft.Azure.Batch.Auth;
+using Microsoft.Azure.Test;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Storage;
 
@@ -25,44 +26,42 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
 {
     public class BatchApplicationTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
-        private string accountName = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountName);
-        private string accountResourceGroup = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountResourceGroup);
+        private string accountName = BatchController.BatchAccount;
         private const string filePath = "Resources\\foo.zip";
 
         [Fact]
         public void TestUploadApplication()
         {
-            string accountName = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountName);
-            BatchController.NewInstance.RunPsTest(string.Format("Test-AddApplication '{0}' '{1}' ", accountName, accountResourceGroup));
+            BatchController.NewInstance.RunPsTest(string.Format("Test-AddApplication"));
         }
 
         [Fact]
         public void TestUploadApplicationPackage()
         {
             BatchController controller = BatchController.NewInstance;
-            controller.RunPsTest(string.Format("Test-UploadApplicationPackage '{0}' '{1}' '{2}'", accountName, accountResourceGroup, filePath));
+            controller.RunPsTest(string.Format("Test-UploadApplicationPackage '{0}'", filePath));
         }
 
         [Fact]
         public void TestUpdateApplicationPackage()
         {
             BatchController controller = BatchController.NewInstance;
-            controller.RunPsTest(string.Format("Test-UpdateApplicationPackage '{0}' '{1}' '{2}'", accountName, accountResourceGroup, filePath));
+            controller.RunPsTest(string.Format("Test-UpdateApplicationPackage '{0}'", filePath));
         }
 
         [Fact]
         public void TestCreatePoolWithApplicationPackage()
         {
             BatchController controller = BatchController.NewInstance;
 
-            controller.RunPsTest(string.Format("Test-CreatePoolWithApplicationPackage '{0}' '{1}' '{2}' '{3}'", accountName, accountName + "pool-id" + Guid.NewGuid().ToString().Substring(0, 5), accountResourceGroup, filePath));
+            controller.RunPsTest(string.Format("Test-CreatePoolWithApplicationPackage '{0}' '{1}' ", accountName + "pool-id" + Guid.NewGuid().ToString().Substring(0, 5), filePath));
         }
 
         [Fact]
         public void TestUpdatePoolWithApplicationPackage()
         {
             BatchController controller = BatchController.NewInstance;
-            controller.RunPsTest(string.Format("Test-UpdatePoolWithApplicationPackage '{0}' '{1}' '{2}' '{3}'", accountName, accountName + "pool-id" + Guid.NewGuid().ToString().Substring(0, 5), accountResourceGroup, filePath));
+            controller.RunPsTest(string.Format("Test-UpdatePoolWithApplicationPackage '{0}' '{1}'", accountName + "pool-id" + Guid.NewGuid().ToString().Substring(0, 5), filePath));
         }
     }
 }

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationTests.cs

@@ -13,29 +13,27 @@
 # ----------------------------------------------------------------------------------
 
 
-
 <#
 .SYNOPSIS
 Tests creating a new application
 #>
 function Test-AddApplication
 {
-    param([string]$accountName, [string]$resourceGroup)
-
-    # Setup
+	# Setup
     $applicationId = "test"
     $applicationVersion = "foo"
+	$context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
 
     try
     {
-        $addAppPack = New-AzureRmBatchApplication -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId
-        $getapp = Get-AzureRmBatchApplication -ResourceGroupName $resourceGroup -AccountName $accountName  -ApplicationId $applicationId
+        $addAppPack = New-AzureRmBatchApplication -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName
+        $getapp = Get-AzureRmBatchApplication -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName
 
         Assert-AreEqual $getapp.Id $addAppPack.Id
     }
     finally
     {
-        Remove-AzureRmBatchApplication -AccountName $accountName -ApplicationId $applicationId -ResourceGroupName $resourceGroup
+        Remove-AzureRmBatchApplication  -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName
     }
 }
 
@@ -45,26 +43,24 @@ Tests uploading an application package.
 #>
 function Test-UploadApplicationPackage
 {
-    param([string]$accountName, [string]$resourceGroup, [string]$filePath)
+    param([string]$filePath)
 
     # Setup
     $applicationId = "test"
     $applicationVersion = "foo"
-
-    Assert-AreNotEqual $null $resourceGroup
-    Assert-AreNotEqual $null $accountName
+	$context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
 
     try
     {
-        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath "D:\ps\azure-powershell-pr\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Resources\foo.zip" -format "zip"
-        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
+        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
+        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
 
         Assert-AreEqual $getapp.Id $addAppPack.Id
         Assert-AreEqual $getapp.Version $addAppPack.Version
     }
     finally
     {
-        Remove-AzureRmBatchApplicationPackage -AccountName $accountName -ApplicationId $applicationId -ResourceGroupName $resourceGroup -ApplicationVersion $applicationVersion
+        Remove-AzureRmBatchApplicationPackage -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName -ApplicationVersion $applicationVersion
     }
 }
 
@@ -74,28 +70,29 @@ Tests can update an application settings
 #>
 function Test-UpdateApplicationPackage
 {
-    param([string]$accountName, [string]$resourceGroup, [string]$filePath)
+    param([string]$filePath)
 
     # Setup
     $applicationId = "test"
     $applicationVersion = "foo"
     $newDisplayName = "application-display-name"
+    $context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
 
     try
     {
-        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
-        $beforeUpdateApp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
+        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
+        $beforeUpdateApp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
 
-        Set-AzureRmBatchApplication -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -displayName $newDisplayName -defaultVersion $applicationVersion -allowUpdates
-        $afterUpdateApp = Get-AzureRmBatchApplication -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId
+        Set-AzureRmBatchApplication -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -displayName $newDisplayName -defaultVersion $applicationVersion
+        $afterUpdateApp = Get-AzureRmBatchApplication -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId
 
         Assert-AreEqual $afterUpdateApp.DefaultVersion "foo"
         Assert-AreNotEqual $afterUpdateApp.DefaultVersion $beforeUpdateApp.DefaultVersion
-        Assert-AreEqual $afterUpdateApp.AllowUpdates $TRUE
+        Assert-AreEqual $afterUpdateApp.AllowUpdates $false
     }
     finally
     {
-        Remove-AzureRmBatchApplicationPackage -AccountName $accountName -ApplicationId $applicationId -ResourceGroupName $resourceGroup -ApplicationVersion $applicationVersion
+        Remove-AzureRmBatchApplicationPackage -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName -ApplicationVersion $applicationVersion
     }
 }
 
@@ -105,7 +102,7 @@ Tests create pool with an application package.
 #>
 function Test-CreatePoolWithApplicationPackage
 {
-    param([string]$accountName, [string] $poolId, [string]$resourceGroup, [string]$filePath)
+    param([string] $poolId, [string]$filePath)
 
     #setup
     $applicationId = "test"
@@ -114,9 +111,9 @@ function Test-CreatePoolWithApplicationPackage
 
     try
     {
-        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
+        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
 
-        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
+        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
 
         Assert-AreEqual $getapp.Id $addAppPack.Id
         Assert-AreEqual $getapp.Version $addAppPack.Version
@@ -131,11 +128,11 @@ function Test-CreatePoolWithApplicationPackage
         $targetOSVersion = "*"
         $paasConfiguration = New-Object Microsoft.Azure.Commands.Batch.Models.PSCloudServiceConfiguration -ArgumentList @($osFamily, $targetOSVersion)
 
-        New-AzureBatchPool -Id $poolId -CloudServiceConfiguration $paasConfiguration -TargetDedicated 3 -VirtualMachineSize "small" -StartTask $startTask -BatchContext $context -ApplicationPackageReferences $apr
+        New-AzureBatchPool -Id $poolId -CloudServiceConfiguration $paasConfiguration -TargetDedicated 3 -VirtualMachineSize "small" -BatchContext $context -ApplicationPackageReferences $apr
     }
     finally
     {
-        Remove-AzureRmBatchApplicationPackage -AccountName $accountName -ApplicationId $applicationId -ResourceGroupName $resourceGroup -ApplicationVersion $applicationVersion
+        Remove-AzureRmBatchApplicationPackage -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName -ApplicationVersion $applicationVersion
         Remove-AzureBatchPool -Id $poolId -Force -BatchContext $context
     }
 }
@@ -146,28 +143,25 @@ Tests update pool with an application package.
 #>
 function Test-UpdatePoolWithApplicationPackage
 {
-    param([string]$accountName, [string] $poolId, [string]$resourceGroup, [string]$filePath)
+    param([string] $poolId, [string]$filePath)
 
     $applicationId = "test"
     $applicationVersion = "foo"
     $context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
 
     try
     {
-        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
-        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $resourceGroup -AccountName $accountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
+        $addAppPack = New-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion -FilePath $filePath -format "zip"
+        $getapp = Get-AzureRmBatchApplicationPackage -ResourceGroupName $context.ResourceGroupName -AccountName $context.AccountName -ApplicationId $applicationId -ApplicationVersion $applicationVersion
 
         Assert-AreEqual $getapp.Id $addAppPack.Id
         Assert-AreEqual $getapp.Version $addAppPack.Version
 
-        $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
-        $startTask.CommandLine = "cmd /c echo hello"
-
         $osFamily = "4"
         $targetOSVersion = "*"
         $paasConfiguration = New-Object Microsoft.Azure.Commands.Batch.Models.PSCloudServiceConfiguration -ArgumentList @($osFamily, $targetOSVersion)
 
-        $addPool = New-AzureBatchPool -Id $poolId -CloudServiceConfiguration $paasConfiguration -TargetDedicated 3 -VirtualMachineSize "small" -StartTask $startTask -BatchContext $context
+        $addPool = New-AzureBatchPool -Id $poolId -CloudServiceConfiguration $paasConfiguration -TargetDedicated 3 -VirtualMachineSize "small" -BatchContext $context
         $getPool = Get-AzureBatchPool -Id $poolId -BatchContext $context
 
         # update pool with application package references
@@ -185,7 +179,7 @@ function Test-UpdatePoolWithApplicationPackage
     }
     finally
     {
-        Remove-AzureRmBatchApplicationPackage -AccountName $accountName -ApplicationId $applicationId -ResourceGroupName $resourceGroup -ApplicationVersion $applicationVersion
+        Remove-AzureRmBatchApplicationPackage -AccountName $context.AccountName -ApplicationId $applicationId -ResourceGroupName $context.ResourceGroupName -ApplicationVersion $applicationVersion
         Remove-AzureBatchPool -Id $poolId -Force -BatchContext $context
     }
 }

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationTests.ps1

@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
 {
     public class BatchController
     {
-        internal static string BatchAccount, BatchAccountKey, BatchAccountUrl;
+        internal static string BatchAccount, BatchAccountKey, BatchAccountUrl, ResourceGroup;
 
         private CSMTestEnvironmentFactory csmTestFactory;
         private EnvironmentSetupHelper helper;
@@ -168,6 +168,7 @@ private BatchManagementClient GetBatchManagementClient()
                 BatchAccount = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountName);
                 BatchAccountKey = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountKey);
                 BatchAccountUrl = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountEndpoint);
+                ResourceGroup = Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountResourceGroup);
 
                 HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountName] = BatchAccount;
                 HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountEndpoint] = BatchAccountUrl;
@@ -177,6 +178,7 @@ private BatchManagementClient GetBatchManagementClient()
                 BatchAccount = HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountName];
                 BatchAccountKey = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000==";
                 BatchAccountUrl = HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountEndpoint];
+                ResourceGroup = HttpMockServer.Variables[ScenarioTestHelpers.BatchAccountResourceGroup];
             }
 
             return TestBase.GetServiceClient<BatchManagementClient>(this.csmTestFactory);

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs

@@ -281,7 +281,7 @@ public void TestTerminateJobPipeline()
         public void TestJobWithTaskDependencies()
         {
             BatchController controller = BatchController.NewInstance;
-            controller.RunPsTest(string.Format("Test-JobWithTaskDependencies '{0}' ", Environment.GetEnvironmentVariable(ScenarioTestHelpers.BatchAccountName)));
+            controller.RunPsTest(string.Format("Test-JobWithTaskDependencies"));
         }
 
         private void TestTerminateJob(bool usePipeline)

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

@@ -530,8 +530,6 @@ Tests create job with TaskDependencies
 #>
 function Test-JobWithTaskDependencies
 {
-    param([string]$accountName)
-
     $context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
     $jobId = "testJob4"
 

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1

@@ -28,6 +28,7 @@ public ScenarioTestContext() : base()
             this.AccountName = BatchController.BatchAccount;
             this.PrimaryAccountKey = BatchController.BatchAccountKey;
             this.TaskTenantUrl = BatchController.BatchAccountUrl;
+            this.ResourceGroupName = BatchController.ResourceGroup;
         }
 
         protected override BatchServiceClient CreateBatchRestClient(string url, string accountName, string key, DelegatingHandler handler = default(DelegatingHandler))