Backup restore handling.

Author: cincuranet

Provider/src/FirebirdSql.Data.UnitTests/FbServicesTests.cs

@@ -66,39 +66,39 @@ public override void SetUp()
 		[Test]
 		public void BackupRestoreTest()
 		{
-			var id = Guid.NewGuid();
-			BackupRestoreTest_BackupPart(id);
-			BackupRestoreTest_RestorePart(id);
-			// test the database was actually restored fine
-			Connection.Open();
-			Connection.Close();
-		}
-		void BackupRestoreTest_BackupPart(Guid id)
-		{
-			FbBackup backupSvc = new FbBackup();
+			var backupName = $"{Guid.NewGuid().ToString()}.bak";
+			void BackupPart()
+			{
+				FbBackup backupSvc = new FbBackup();
 
-			backupSvc.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
-			backupSvc.Options = FbBackupFlags.IgnoreLimbo;
-			backupSvc.BackupFiles.Add(new FbBackupFile(CreateBackupFilename(id), 2048));
-			backupSvc.Verbose = true;
+				backupSvc.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
+				backupSvc.Options = FbBackupFlags.IgnoreLimbo;
+				backupSvc.BackupFiles.Add(new FbBackupFile(backupName, 2048));
+				backupSvc.Verbose = true;
 
-			backupSvc.ServiceOutput += new EventHandler<ServiceOutputEventArgs>(ServiceOutput);
+				backupSvc.ServiceOutput += new EventHandler<ServiceOutputEventArgs>(ServiceOutput);
 
-			backupSvc.Execute();
-		}
-		void BackupRestoreTest_RestorePart(Guid id)
-		{
-			FbRestore restoreSvc = new FbRestore();
+				backupSvc.Execute();
+			}
+			void RestorePart()
+			{
+				FbRestore restoreSvc = new FbRestore();
 
-			restoreSvc.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
-			restoreSvc.Options = FbRestoreFlags.Create | FbRestoreFlags.Replace;
-			restoreSvc.PageSize = TestsSetup.PageSize;
-			restoreSvc.Verbose = true;
-			restoreSvc.BackupFiles.Add(new FbBackupFile(CreateBackupFilename(id), 2048));
+				restoreSvc.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
+				restoreSvc.Options = FbRestoreFlags.Create | FbRestoreFlags.Replace;
+				restoreSvc.PageSize = TestsSetup.PageSize;
+				restoreSvc.Verbose = true;
+				restoreSvc.BackupFiles.Add(new FbBackupFile(backupName, 2048));
 
-			restoreSvc.ServiceOutput += new EventHandler<ServiceOutputEventArgs>(ServiceOutput);
+				restoreSvc.ServiceOutput += new EventHandler<ServiceOutputEventArgs>(ServiceOutput);
 
-			restoreSvc.Execute();
+				restoreSvc.Execute();
+			}
+			BackupPart();
+			RestorePart();
+			// test the database was actually restored fine
+			Connection.Open();
+			Connection.Close();
 		}
 
 		[TestCase(true)]
@@ -346,42 +346,45 @@ public void NBackupBackupRestoreTest()
 			if (!EnsureVersion(new Version("2.5.0.0")))
 				return;
 
-			var id = Guid.NewGuid();
-			NBackupBackupRestoreTest_BackupPart(id);
-			NBackupBackupRestoreTest_RestorePart(id);
-		}
-		void NBackupBackupRestoreTest_BackupPart(Guid id)
-		{
-			Action<int> doLevel = l =>
+			const int Levels = 2;
+			var backupName = $"{Guid.NewGuid().ToString()}.nbak";
+			void BackupPart()
 			{
-				var nbak = new FbNBackup();
+				void DoLevel(int level)
+				{
+					var nbak = new FbNBackup();
 
-				nbak.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
-				nbak.Level = l;
-				nbak.BackupFile = CreateBackupFilename(id) + l.ToString();
-				nbak.DirectIO = true;
-				nbak.Options = FbNBackupFlags.NoDatabaseTriggers;
+					nbak.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
+					nbak.Level = level;
+					nbak.BackupFile = backupName + level.ToString();
+					nbak.DirectIO = true;
+					nbak.Options = FbNBackupFlags.NoDatabaseTriggers;
 
-				nbak.ServiceOutput += ServiceOutput;
+					nbak.ServiceOutput += ServiceOutput;
 
-				nbak.Execute();
-			};
-			doLevel(0);
-			doLevel(1);
-		}
-		void NBackupBackupRestoreTest_RestorePart(Guid id)
-		{
-			FbConnection.DropDatabase(BuildConnectionString(FbServerType, Compression));
+					nbak.Execute();
+				}
+				for (int i = 0; i < Levels; i++)
+				{
+					DoLevel(i);
+				}
+			}
+			void RestorePart()
+			{
+				FbConnection.DropDatabase(BuildConnectionString(FbServerType, Compression));
 
-			var nrest = new FbNRestore();
+				var nrest = new FbNRestore();
 
-			nrest.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
-			nrest.BackupFiles = Enumerable.Range(0, 2).Select(l => CreateBackupFilename(id) + l.ToString());
-			nrest.DirectIO = true;
+				nrest.ConnectionString = BuildServicesConnectionString(FbServerType, Compression, true);
+				nrest.BackupFiles = Enumerable.Range(0, Levels).Select(l => backupName + l.ToString());
+				nrest.DirectIO = true;
 
-			nrest.ServiceOutput += ServiceOutput;
+				nrest.ServiceOutput += ServiceOutput;
 
-			nrest.Execute();
+				nrest.Execute();
+			}
+			BackupPart();
+			RestorePart();
 		}
 
 		[Test]
@@ -427,11 +430,6 @@ void ServiceOutput(object sender, ServiceOutputEventArgs e)
 			TestContext.WriteLine(e.Message);
 		}
 
-		string CreateBackupFilename(Guid id)
-		{
-			return $"{TestsSetup.Database(FbServerType, Compression)}_{id}.fbk";
-		}
-
 		#endregion
 	}
 }