Updated ListRestorePoints test and removed SizeBytes from RestorePointProperties

Author: caln-microsoft

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

@@ -342,6 +342,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseActivationTests\TestDatabasePauseResumePiped.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests\TestListDatabaseRestorePoints.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs

@@ -22,16 +22,9 @@ public class DatabaseBackupTests : SqlTestsBase
     {
         [Fact]
         [Trait(Category.Sql, Category.CheckIn)]
-        public void TestDatabasePauseResume()
+        public void TestListDatabaseRestorePoints()
         {
             RunPowerShellTest("Test-ListDatabaseRestorePoints");
         }
-
-        [Fact]
-        [Trait(Category.Sql, Category.CheckIn)]
-        public void TestDatabasePauseResumePiped()
-        {
-            RunPowerShellTest("Test-ListDatabaseRestorePointsPiped");
-        }
     }
 }

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

@@ -12,53 +12,11 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
-<#
-	.SYNOPSIS
-	Test getting restore points from databases.
-#>
-function Test-ListDatabaseRestorePoints
-{
-	# Setup
-	$location = "Japan East"
-	$serverVersion = "12.0";
-	$rg = Create-ResourceGroupForTest
-
-	try
-	{
-		$server = Create-ServerForTest $rg $serverVersion $location
-
-		# Create data warehouse database with all parameters.
-		$databaseName = Get-DatabaseName
-		$dwdb = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
-			-Edition DataWarehouse -RequestedServiceObjectiveName DW100
-
-		$databaseName = Get-DatabaseName
-		$standarddb = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
-			-Edition Standard -RequestedServiceObjectiveName S0
-
-		# Get restore points from data warehouse database. There should be none.
-		$restorePoints =  Get-AzureSqlDatabaseRestorePoints -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName
-		Assert-True $restorePoints.IsEmpty
-
-		# Get restore points from standard database.There should be 1.
-		$restorePoints = Resume-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $standarddb.DatabaseName
-		$restorePoint = $restorePoints[0]
-		Assert-AreEqual $restorePoint.RestorePointType Continuous
-		Assert-Null $restorePoint.RestorePointCreationDate
-		Assert-NotNull $restorePoint.EarliestRestoreDate 
-		Assert-AreEqual $restorePoint.SizeBytes 0
-	}
-	finally
-	{
-		Remove-ResourceGroupForTest $rg
-	}
-}
-
 <#
 	.SYNOPSIS
 	Test getting restore points from databases via piped cmdlets.
 #>
-function Test-ListDatabaseRestorePointsPiped
+function Test-ListDatabaseRestorePoints
 {
 	# Setup
 	$location = "Japan East"
@@ -78,16 +36,17 @@ function Test-ListDatabaseRestorePointsPiped
 		$standarddb = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
 			-Edition Standard -RequestedServiceObjectiveName S0
 
-		# Get restore points from data warehouse database.
-		Assert-True $restorePoints.IsEmpty
+		# Get restore points from data warehouse database normally.
+		$restorePoints = Get-AzureSqlDatabaseRestorePoints -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName
+		Assert-Null $restorePoints # Since the data warehouse database has just been created, it should not have any discrete restore points.
 
-		# Get restore points from standard database.
-		$restorePoints = $standarddb | Resume-AzureSqlDatabase
+		# Get restore points from standard database piped.
+		$restorePoints = $standarddb | Get-AzureSqlDatabaseRestorePoints 
+		Assert-AreEqual $restorePoints.Count 1 # Standard databases should only have 1 continuous restore point.
 		$restorePoint = $restorePoints[0]
 		Assert-AreEqual $restorePoint.RestorePointType Continuous
 		Assert-Null $restorePoint.RestorePointCreationDate
-		Assert-NotNull $restorePoint.EarliestRestoreDate 
-		Assert-AreEqual $restorePoint.SizeBytes 0
+		Assert-True { $restorePoint.EarliestRestoreDate -le [DateTime]::UtcNow }
 	}
 	finally
 	{