Tidy unit tests

EDCD · Jan 5, 2025 · 36630e4 · 36630e4
1 parent f9e0b86
commit 36630e4
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 29 deletions.
diff --git a/DataProviderService/DataProviderService.cs b/DataProviderService/DataProviderService.cs
@@ -34,7 +34,7 @@ public DataProviderService ( BgsService bgsService = null, StarMapService edsmSe
             this.bgsService = bgsService ?? new BgsService();
             this.edsmService = edsmService ?? new StarMapService();
             this.spanshService = spanshService ?? new SpanshService();
-            this.starSystemRepository = starSystemRepository ?? new StarSystemSqLiteRepository();
+            this.starSystemRepository = starSystemRepository ?? new StarSystemSqLiteRepository(unitTesting);
         }
 
         public List<string> GetTypeAheadSystems ( string systemName )

diff --git a/DataProviderService/SqlLiteBaseRepository.cs b/DataProviderService/SqlLiteBaseRepository.cs
@@ -1,14 +1,34 @@
 using System.Data.SQLite;
+using System.IO;
 using Utilities;
 
 namespace EddiDataProviderService
 {
     public class SqLiteBaseRepository
     {
-        public static string DbFile
+        protected static bool unitTesting
         {
-            get { return Constants.DATA_DIR + @"\EDDI.sqlite"; }
+            get => _unitTesting;
+            set
+            {
+                if ( _unitTesting != value )
+                {
+                    ResetTestDatabase();
+                    _unitTesting = value;
+                }
+            }
         }
+        private static bool _unitTesting;
+
+        private static void ResetTestDatabase ()
+        {
+            var testDatabase = new FileInfo( Constants.DATA_DIR + @"\EDDI_TEST.sqlite" );
+            if ( testDatabase.Exists ) { testDatabase.Delete(); }
+        }
+
+        protected static string DbFile => unitTesting 
+            ? Constants.DATA_DIR + @"\EDDI_TEST.sqlite"
+            : Constants.DATA_DIR + @"\EDDI.sqlite";
 
         public static SQLiteConnection SimpleDbConnection()
         {

diff --git a/DataProviderService/StarSystemSqLiteRepository.cs b/DataProviderService/StarSystemSqLiteRepository.cs
@@ -98,9 +98,10 @@ UPDATE starsystems
         private const string WHERE_SYSTEMADDRESS = @"WHERE systemaddress = @systemaddress; PRAGMA optimize;";
         private const string WHERE_NAME = @"WHERE name = @name; PRAGMA optimize;";
 
-        public StarSystemSqLiteRepository ( SQLiteConnection connection = null )
+        public StarSystemSqLiteRepository ( bool unitTesting = false )
         {
-            CreateOrUpdateDatabase( connection );
+            SqLiteBaseRepository.unitTesting = unitTesting;
+            CreateOrUpdateDatabase();
         }
 
         public DatabaseStarSystem GetSqlStarSystem ( ulong systemAddress )
@@ -468,11 +469,11 @@ private void deleteStarSystems(ImmutableList<StarSystem> systems)
             }
         }
 
-        private void CreateOrUpdateDatabase( SQLiteConnection connection = null )
+        private void CreateOrUpdateDatabase()
         {
             lock ( nameof(SimpleDbConnection) ) // Lock before writing to the database
             {
-                using ( var con = connection ?? SimpleDbConnection() )
+                using ( var con = SimpleDbConnection() )
                 {
                     try
                     {
@@ -554,7 +555,7 @@ private void CreateOrUpdateDatabase( SQLiteConnection connection = null )
         }
 
         /// <summary> Valid columnNames are "systemaddress" and "comment" </summary>
-        private static void AddColumnIfMissing(SQLiteConnection con, string columnName)
+        private void AddColumnIfMissing(SQLiteConnection con, string columnName )
         {
             // Parameters like `DISTINCT` cannot be set on columns by this method
             string command = string.Empty;
@@ -567,42 +568,44 @@ private static void AddColumnIfMissing(SQLiteConnection con, string columnName)
                     command = @"ALTER TABLE starsystems ADD COLUMN comment TEXT;";
                     break;
             }
-            if (!string.IsNullOrEmpty(command))
+
+            if ( !string.IsNullOrEmpty( command ) )
             {
                 bool columnExists = false;
-                using (var cmd = new SQLiteCommand(TABLE_INFO_SQL, con))
+                using ( var cmd = new SQLiteCommand( TABLE_INFO_SQL, con ) )
                 {
-                    using (SQLiteDataReader rdr = cmd.ExecuteReader())
+                    using ( SQLiteDataReader rdr = cmd.ExecuteReader() )
                     {
-                        while (rdr.Read())
+                        while ( rdr.Read() )
                         {
-                            if (columnName == rdr.GetString(1))
+                            if ( columnName == rdr.GetString( 1 ) )
                             {
                                 columnExists = true;
                                 break;
                             }
                         }
                     }
                 }
-                if (!columnExists)
+
+                if ( !columnExists )
                 {
-                    Logging.Debug("Updating starsystem repository with new column " + columnName);
+                    Logging.Debug( "Updating starsystem repository with new column " + columnName );
                     try
                     {
-                        using (var cmd = new SQLiteCommand(command, con))
+                        using ( var cmd = new SQLiteCommand( command, con ) )
                         {
                             cmd.ExecuteNonQuery();
                         }
                     }
-                    catch (SQLiteException ex)
+                    catch ( SQLiteException ex )
                     {
-                        handleSqlLiteException(con, ex);
+                        handleSqlLiteException( con, ex );
                     }
                 }
             }
         }
 
-        private static void handleSqlLiteException(SQLiteConnection con, SQLiteException ex)
+        private void handleSqlLiteException( SQLiteConnection con, SQLiteException ex )
         {
             Logging.Warn("SQLite error: ", ex.ToString());
 

diff --git a/Tests/EddnTests.cs b/Tests/EddnTests.cs
diff --git a/Tests/TestBase.cs b/Tests/TestBase.cs
@@ -8,7 +8,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Data.SQLite;
 using System.IO;
 
 // Number of worker threads is automatic because `Workers` is set to 0.
@@ -33,9 +32,7 @@ public class TestBase
         internal static readonly FakeEdsmRestClient fakeEdsmRestClient = new FakeEdsmRestClient();
         internal static readonly StarMapService fakeEdsmService = new StarMapService(fakeEdsmRestClient);
 
-        private static readonly string testDatabaseDir = @"C:\Temp";
-        internal static SQLiteConnection fakeSqLiteConnection;
-        internal static StarSystemSqLiteRepository fakeStarSystemSqLiteRepository;
+        internal static StarSystemSqLiteRepository fakeStarSystemSqLiteRepository = new StarSystemSqLiteRepository( true );
 
         internal void MakeSafe()
         {
@@ -54,11 +51,6 @@ internal void MakeSafe()
 
         internal DataProviderService ConfigureTestDataProvider ()
         {
-            // Create a temporary database for testing
-            Directory.CreateDirectory( testDatabaseDir );
-            fakeSqLiteConnection = new SQLiteConnection( $@"Data Source={testDatabaseDir}\EDDI_TEST.sqlite" );
-            fakeStarSystemSqLiteRepository = new StarSystemSqLiteRepository( fakeSqLiteConnection );
-
             return new DataProviderService( fakeBgsService, fakeEdsmService, fakeSpanshService, fakeStarSystemSqLiteRepository );
         }