Fix tests and annotations

AngelMunoz · Oct 1, 2023 · 902a2d3 · 902a2d3
1 parent a5118e7
commit 902a2d3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 17 deletions.
diff --git a/src/Migrondi.Core/Database.fs b/src/Migrondi.Core/Database.fs
@@ -150,6 +150,7 @@ type DatabaseService =
     [<Optional>] ?cancellationToken: CancellationToken ->
       Task<MigrationRecord IReadOnlyList>
 
+
 [<RequireQualifiedAccess>]
 module Queries =
   let createTable driver tableName =
@@ -181,7 +182,7 @@ CREATE TABLE dbo.%s{tableName}(
 );
 GO"""
 
-module MigrationsImpl =
+module internal MigrationsImpl =
 
   let inline private (=>) (a: string) b = a, box b
 

diff --git a/src/Migrondi.Core/Database.fsi b/src/Migrondi.Core/Database.fsi
@@ -1,6 +1,7 @@
 namespace Migrondi.Core.Database
 
 open System.Collections.Generic
+open System.Data
 open System.Runtime.InteropServices
 open System.Threading
 open System.Threading.Tasks
@@ -135,6 +136,10 @@ type DatabaseService =
     migrations: Migration seq * [<Optional>] ?cancellationToken: CancellationToken ->
       Task<MigrationRecord IReadOnlyList>
 
+module internal MigrationsImpl =
+
+  val getConnection: connectionString: string * driver: MigrondiDriver -> IDbConnection
+
 [<Class>]
 type DatabaseServiceFactory =
   /// <summary>

diff --git a/src/Migrondi.Core/Migrondi.Core.fsproj b/src/Migrondi.Core/Migrondi.Core.fsproj
@@ -13,8 +13,10 @@
     </Summary>
     <IsPackable>True</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <InternalsVisibleTo>Migrondi.Tests</InternalsVisibleTo>
   </PropertyGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Migrondi.Tests" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Library.fsi" />
     <Compile Include="Library.fs" />

diff --git a/src/Migrondi.Tests/Database.Async.fs b/src/Migrondi.Tests/Database.Async.fs
@@ -5,6 +5,8 @@ open System.Threading.Tasks
 
 open Microsoft.VisualStudio.TestTools.UnitTesting
 
+open Microsoft.Extensions.Logging
+
 open RepoDb
 
 open FsToolkit.ErrorHandling
@@ -14,21 +16,17 @@ open Migrondi.Core.Database
 
 open Migrondi.Tests.Database
 
-open Serilog
-open Serilog.Extensions.Logging
-
 
 [<TestClass>]
 type DatabaseAsyncTests() =
 
   let dbName = Guid.NewGuid()
   let config = DatabaseData.getConfig dbName
 
-  let baseLogger =
-    LoggerConfiguration().MinimumLevel.Debug().WriteTo.Console().CreateLogger()
+  let loggerFactory =
+    LoggerFactory.Create(fun builder -> builder.SetMinimumLevel(LogLevel.Debug).AddSimpleConsole() |> ignore)
 
-  let loggerFactory = new SerilogLoggerFactory(baseLogger)
-  let logger = loggerFactory.CreateLogger("Migrondi:Tests.Database.Async")
+  let logger = loggerFactory.CreateLogger("Migrondi:Tests.Database")
 
   let databaseEnv =
     DatabaseServiceFactory.GetInstance(logger, DatabaseData.getConfig dbName)

diff --git a/src/Migrondi.Tests/Database.fs b/src/Migrondi.Tests/Database.fs
@@ -8,11 +8,11 @@ open RepoDb
 
 open FsToolkit.ErrorHandling
 
+open Microsoft.Extensions.Logging
+
 open Migrondi.Core
 open Migrondi.Core.Database
 
-open Serilog
-open Serilog.Extensions.Logging
 
 module DatabaseData =
   open System.Data
@@ -91,10 +91,9 @@ type DatabaseTests() =
   let dbName = Guid.NewGuid()
   let config = DatabaseData.getConfig dbName
 
-  let baseLogger =
-    LoggerConfiguration().MinimumLevel.Debug().WriteTo.Console().CreateLogger()
+  let loggerFactory =
+    LoggerFactory.Create(fun builder -> builder.SetMinimumLevel(LogLevel.Debug).AddSimpleConsole() |> ignore)
 
-  let loggerFactory = new SerilogLoggerFactory(baseLogger)
   let logger = loggerFactory.CreateLogger("Migrondi:Tests.Database")
 
   let databaseEnv =

diff --git a/src/Migrondi.Tests/FileSystem.fs b/src/Migrondi.Tests/FileSystem.fs
@@ -1,17 +1,17 @@
 module Migrondi.Tests.FileSystem
 
-
 open System
 open System.IO
 open System.Threading.Tasks
 open Microsoft.VisualStudio.TestTools.UnitTesting
 
 open FSharp.UMX
 
+open Microsoft.Extensions.Logging
+
 open Migrondi.Core
 open Migrondi.Core.Serialization
 open Migrondi.Core.FileSystem
-open Migrondi.Core.FileSystem.Units
 
 open FsToolkit.ErrorHandling
 
@@ -77,9 +77,15 @@ type FileSystemTests() =
 
   let serializer = SerializerServiceFactory.GetInstance()
 
+  let loggerFactory =
+    LoggerFactory.Create(fun builder -> builder.SetMinimumLevel(LogLevel.Debug).AddSimpleConsole() |> ignore)
+
+  let logger = loggerFactory.CreateLogger("Migrondi:Tests.Database")
+
   let fileSystem =
     FileSystemServiceFactory.GetInstance(
       serializer,
+      logger,
       baseUri,
       Uri("fs-migrations/", UriKind.Relative)
     )

diff --git a/src/Migrondi.Tests/Migrondi.Tests.fsproj b/src/Migrondi.Tests/Migrondi.Tests.fsproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Migrondi.Core\Migrondi.Core.fsproj" />