From caaedccc61e69c0fd2a539f6e1dac69d41fc6875 Mon Sep 17 00:00:00 2001
From: Kenneth Hsu <kennethhsu@gmail.com>
Date: Sun, 18 Aug 2019 16:46:38 -0700
Subject: [PATCH] Remove recreated database file after each test.

---
 Duplicati/UnitTest/BasicSetupHelper.cs |  2 +-
 Duplicati/UnitTest/BorderTests.cs      | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Duplicati/UnitTest/BasicSetupHelper.cs b/Duplicati/UnitTest/BasicSetupHelper.cs
index 200d85ff2..7da3290fc 100644
--- a/Duplicati/UnitTest/BasicSetupHelper.cs
+++ b/Duplicati/UnitTest/BasicSetupHelper.cs
@@ -100,7 +100,7 @@ namespace Duplicati.UnitTest
         }
 
         [TearDown]
-        public void TearDown()
+        public virtual void TearDown()
         {
             if (Directory.Exists(this.DATAFOLDER))
             {
diff --git a/Duplicati/UnitTest/BorderTests.cs b/Duplicati/UnitTest/BorderTests.cs
index d348b45b8..c67a0a299 100644
--- a/Duplicati/UnitTest/BorderTests.cs
+++ b/Duplicati/UnitTest/BorderTests.cs
@@ -24,6 +24,18 @@ namespace Duplicati.UnitTest
 {
     public class BorderTests : BasicSetupHelper
     {
+        private readonly string recreatedDatabaseFile = Path.Combine(BASEFOLDER, "recreated-database.sqlite");
+
+        public override void TearDown()
+        {
+            base.TearDown();
+
+            if (File.Exists(this.recreatedDatabaseFile))
+            {
+                File.Delete(this.recreatedDatabaseFile);
+            }
+        }
+
         [Test]
         [Category("Border")]
         public void Run10kNoProgress()
@@ -264,11 +276,7 @@ namespace Duplicati.UnitTest
                 Assert.AreEqual((filenames.Count * 3) + 1, r.Files.Count());
             }
 
-            var newdb = Path.Combine(Path.GetDirectoryName(DBFILE), Path.ChangeExtension(Path.GetFileNameWithoutExtension(DBFILE) + "-recreated", Path.GetExtension(DBFILE)));
-            if (File.Exists(newdb))
-                File.Delete(newdb);
-
-            testopts["dbpath"] = newdb;
+            testopts["dbpath"] = this.recreatedDatabaseFile;
 
             using(var c = new Library.Main.Controller("file://" + TARGETFOLDER, testopts, null))
                 c.Repair();