Rerecorded tests, and fix some bugs found during testing.

Author: brandong-ms

src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.ps1

@@ -398,7 +398,7 @@ function Test-LongTermRetentionV2ResourceGroupBased
 	$serverName = "brandong-ltr-ps-test"
 	$databaseName = "testdb2"
 	$restoredDatabase = "testdb_restored"
-	$databaseWithRemovableBackup = "testdb";
+	$databaseWithRemovableBackup = "testdb2";
 
 	# Basic Get Tests
 	$backups = Get-AzSqlDatabaseLongTermRetentionBackup -Location $locationName -ResourceGroupName $resourceGroup
@@ -452,10 +452,10 @@ function Test-LongTermRetentionV2ResourceGroupBased
 	$backupForLegalHold = Get-AzSqlDatabaseLongTermRetentionBackup -Location $locationName -ServerName $serverName -DatabaseName $backupForLegalHold.DatabaseName -BackupName $backupForLegalHold.BackupName -ResourceGroupName $resourceGroup | Remove-AzSqlDatabaseLongTermRetentionBackupLegalHold -Force -ForceDropExpired -PassThru
 	Assert-AreEqual $backupForLegalHold.LegalHoldImmutability "Disabled"
 
-	Get-AzSqlDatabase -ResourceGroup $resourceGroup -ServerName $serverName -DatabaseName $databaseWithRemovableBackup | Get-AzSqlDatabaseLongTermRetentionBackup -OnlyLatestPerDatabase
+	$removableBackup = Get-AzSqlDatabase -ResourceGroup $resourceGroup -ServerName $serverName -DatabaseName $databaseWithRemovableBackup | Get-AzSqlDatabaseLongTermRetentionBackup -OnlyLatestPerDatabase
 
 	# Test Remove with Piping
-	Get-AzSqlDatabaseLongTermRetentionBackup -Location $locationName -ServerName $serverName -DatabaseName $databaseWithRemovableBackup -BackupName $backups[0].BackupName -ResourceGroupName $resourceGroup | Remove-AzSqlDatabaseLongTermRetentionBackup -Force
+	Get-AzSqlDatabaseLongTermRetentionBackup -Location $locationName -ServerName $serverName -DatabaseName $databaseWithRemovableBackup -BackupName $removableBackup.BackupName -ResourceGroupName $resourceGroup | Remove-AzSqlDatabaseLongTermRetentionBackup -Force
 
 	# drop the restored db
 	Remove-AzSqlDatabase -ResourceGroup $resourceGroup -ServerName $serverName -DatabaseName $restoredDatabase -Force

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests/TestLongTermRetentionLockImmutability.json

@@ -181,7 +181,7 @@ protected override IEnumerable<AzureSqlDatabaseLongTermRetentionBackupModel> Per
             }
             else
             {
-                ModelAdapter.LockDatabaseLongTermRetentionBackupImmutabilityByResourceGroup(Location, ServerName, DatabaseName, BackupName, ResourceGroupName);
+                ModelAdapter.LockDatabaseLongTermRetentionBackupImmutabilityByResourceGroup(ResourceGroupName, Location, ServerName, DatabaseName, BackupName);
             }
 
             if (PassThru.IsPresent)

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests/TestLongTermRetentionRemoveImmutability.json

@@ -181,7 +181,7 @@ protected override IEnumerable<AzureSqlDatabaseLongTermRetentionBackupModel> Per
             }
             else
             {
-                ModelAdapter.RemoveDatabaseLongTermRetentionBackupImmutabilityByResourceGroup(Location, ServerName, DatabaseName, BackupName, this.ResourceGroupName);
+                ModelAdapter.RemoveDatabaseLongTermRetentionBackupImmutabilityByResourceGroup(ResourceGroupName, Location, ServerName, DatabaseName, BackupName);
             }
 
             if (PassThru.IsPresent)

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests/TestLongTermRetentionV2ResourceGroupBased.json

@@ -187,7 +187,7 @@ protected override IEnumerable<AzureSqlDatabaseLongTermRetentionBackupModel> Per
             }
             else
             {
-                ModelAdapter.RemoveDatabaseLongTermRetentionBackupLegalHoldByResourceGroup(Location, ServerName, DatabaseName, BackupName, this.ResourceGroupName);
+                ModelAdapter.RemoveDatabaseLongTermRetentionBackupLegalHoldByResourceGroup(ResourceGroupName, Location, ServerName, DatabaseName, BackupName);
             }
 
             if (PassThru.IsPresent)