Complete integrated tests??? Fix bugs.

1 files changed, 3 insertions, 19 deletions

diff --git a/Timeline.Tests/Helpers/TestApplication.cs b/Timeline.Tests/Helpers/TestApplication.cs
index b0187a30..5862f452 100644
--- a/Timeline.Tests/Helpers/TestApplication.cs
+++ b/Timeline.Tests/Helpers/TestApplication.cs
@@ -10,26 +10,11 @@ namespace Timeline.Tests.Helpers
 {

     public class TestApplication : IDisposable

     {

-        public SqliteConnection DatabaseConnection { get; } = new SqliteConnection("Data Source=:memory:;");

+        public TestDatabase Database { get; } = new TestDatabase();

         public WebApplicationFactory<Startup> Factory { get; }

 

         public TestApplication(WebApplicationFactory<Startup> factory)

         {

-            // We should keep the connection, so the database is persisted but not recreate every time.

-            // See https://docs.microsoft.com/en-us/ef/core/miscellaneous/testing/sqlite#writing-tests .

-            DatabaseConnection.Open();

-

-            {

-                var options = new DbContextOptionsBuilder<DatabaseContext>()

-                    .UseSqlite(DatabaseConnection)

-                    .Options;

-

-                using (var context = new DatabaseContext(options))

-                {

-                    TestDatabase.InitDatabase(context);

-                };

-            }

-

             Factory = factory.WithWebHostBuilder(builder =>

             {

                 builder.ConfigureServices(services =>

@@ -37,7 +22,7 @@ namespace Timeline.Tests.Helpers
                     services.AddEntityFrameworkSqlite();

                     services.AddDbContext<DatabaseContext>(options =>

                     {

-                        options.UseSqlite(DatabaseConnection);

+                        options.UseSqlite(Database.Connection);

                     });

                 });

             });

@@ -45,8 +30,7 @@ namespace Timeline.Tests.Helpers
 

         public void Dispose()

         {

-            DatabaseConnection.Close();

-            DatabaseConnection.Dispose();

+            Database.Dispose();

         }

     }

 }