moved away for external dep xunit, added extra tests, ExcludeFromCodeCoverage is removed in smome placed a strat with testing integration test in the action

Author: Retrodad0001

.editorconfig

@@ -101,6 +101,17 @@ dotnet_diagnostic.IDE0059.severity = warning
 # CA1873: Avoid potentially expensive logging
 dotnet_diagnostic.CA1873.severity = warning
 
+# MSTEST0068: Use 'Assert' instead of 'CollectionAssert'
+dotnet_diagnostic.MSTEST0068.severity = warning
+
+# MSTEST0037: Use proper 'Assert' methods
+dotnet_diagnostic.MSTEST0037.severity = warning
+
+# MSTEST0058: Do not use asserts in catch blocks. The integration tests catch
+# everything on purpose so a failure can be reported together with the migrator
+# log, and every catch block ends in Assert.Fail, so nothing can pass silently.
+dotnet_diagnostic.MSTEST0058.severity = none
+
 [*.vb]
 #### Naming styles ####
 

.github/workflows/BuildRelease.yml

@@ -5,34 +5,27 @@ on:
     branches: [ '**'  ]
   pull_request:
     branches: [ '**'  ]
-    
+
 jobs:
   BuildRelease:
     name: Release build EasyDBMigrator Package
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
-  
+
     steps:
     - name: Check out the Repository
-      uses: actions/checkout@v2
-
-    - name: Setup .NET Core 8.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 8.0.x
+      uses: actions/checkout@v5
 
-    - name: Setup .NET Core 9.0.x
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
 
-    - name: Setup .NET Core 10.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 10.0.x
-   
     - name: Restore dependencies
       run: dotnet restore
-    
+
     - name: Build Release version
       run: dotnet build --configuration Release --no-restore

.github/workflows/BuildTestDebug.yml

@@ -5,40 +5,39 @@ on:
     branches: [ '**'  ]
   pull_request:
     branches: [ '**'  ]
-    
+
 jobs:
   BuildAndTest:
     name: EasyDBMigrator Package
-    runs-on: windows-latest
-    timeout-minutes: 15
-  
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
     steps:
     - name: Check out the Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v5
 
-    - name: Setup .NET Core 8.0.x
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
 
-    - name: Setup .NET Core 9.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 9.0.x
-
-    - name: Setup .NET Core 10.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 10.0.x
-   
     - name: Restore dependencies
       run: dotnet restore
-    
+
     - name: Build debug version all
       run: dotnet build --configuration Debug --no-restore
- 
-    - name: Run unittest with code-coverage
-      run: dotnet test --no-build --verbosity normal --filter Category!=Integrationtest /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-    
+
+    # Microsoft.Testing.Platform runner, opted in via the "test" section of global.json.
+    # MTP takes --coverage instead of coverlet.
+    # The integration tests start their own SQL Server and Postgres containers, which
+    # is why this job runs on Linux: the Windows runners cannot run Linux containers.
+    - name: Run all tests with code-coverage
+      run: dotnet test --no-build --coverage --coverage-output-format cobertura
+
     - name: Upload code coverage to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/PackageAndReleaseMasterToNuGet.yml

@@ -3,35 +3,27 @@ name: Release Master NuGet
 on:
   push:
     branches: [ master ]
- 
+
 jobs:
   Release:
     name: Release to Nuget
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    
+
     steps:
     - name: Check out Repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v5
 
-    - name: Setup .NET Core 8.0.x
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
 
-    - name: Setup .NET Core 9.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 9.0.x
-
-    - name: Setup .NET Core 10.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 10.0.x
-    
     - name: Pack
-      run: dotnet pack EasyDbMigrator\\EasyDbMigrator.csproj -c Release
-  
-    - name: Publish to Nuget 
-      run: dotnet nuget push /home/runner/work/EasyDbMigrator/EasyDbMigrator/EasyDbMigrator/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      run: dotnet pack EasyDbMigrator/EasyDbMigrator.csproj -c Release -o ./artifacts
 
+    - name: Publish to Nuget
+      run: dotnet nuget push ./artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

.vscode/settings.json

@@ -2,13 +2,15 @@
     "cSpell.words": [
         "accessibilities",
         "buildtransitive",
+        "cobertura",
         "contentfiles",
         "datname",
         "Integrationtest",
         "msbuild",
+        "mstest",
         "netcoreapp",
         "Npgsql",
-        "Retrodad",
-        "xunit"
+        "Parallelize",
+        "Retrodad"
     ]
-}
+}

EasyDbMigrator/AssemblyResourceHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -11,7 +10,6 @@ namespace EasyDbMigrator;
 /// <summary>
 /// Helps to get script files embedded in an assembly
 /// </summary>
-[ExcludeFromCodeCoverage] //is tested with integrationTest
 public sealed class AssemblyResourceHelper : IAssemblyResourceHelper
 {
     /// <summary>
@@ -22,21 +20,16 @@ public sealed class AssemblyResourceHelper : IAssemblyResourceHelper
     /// <exception cref="InvalidOperationException"></exception>
     public async Task<List<Script>> TryGetScriptsFromAssembly(Type typeOfClassWhereScriptsAreLocated)
     {
-        Assembly? assembly = Assembly.GetAssembly(typeOfClassWhereScriptsAreLocated);
+        ArgumentNullException.ThrowIfNull(argument: typeOfClassWhereScriptsAreLocated);
 
-        string[] filenames = TryGetManifestResourceNamesFromAssembly(typeOfClassWhereScriptsAreLocated);
+        Assembly assembly = typeOfClassWhereScriptsAreLocated.Assembly;
+        string[] filenames = assembly.GetManifestResourceNames();
 
         List<Script> scripts = new(filenames.Length);
         foreach (string filename in filenames)
         {
-            await using Stream? stream = assembly?.GetManifestResourceStream(filename);
-            if (stream is null)
-            {
-                throw new InvalidOperationException(new StringBuilder()
-                    .Append("steam cannot be null for resource name: ")
-                    .Append(filename)
-                    .ToString());
-            }
+            await using Stream stream = assembly.GetManifestResourceStream(filename)
+                ?? throw new InvalidOperationException(new StringBuilder().Append("stream cannot be null for resource name: ").Append(filename).ToString());
 
             using StreamReader reader = new(stream);
             string filenameWithNoNamespaces = RemoveTheNamespaceFromName(filename);
@@ -49,21 +42,6 @@ public async Task<List<Script>> TryGetScriptsFromAssembly(Type typeOfClassWhereS
         return scripts;
     }
 
-    private static string[] TryGetManifestResourceNamesFromAssembly(Type typeOfClassWhereScriptsAreLocated)
-    {
-        Assembly? assembly = Assembly.GetAssembly(typeOfClassWhereScriptsAreLocated);
-
-        if (assembly is null)
-        {
-            throw new InvalidOperationException(new StringBuilder().Append("assembly is null for custom-class: ")
-                .Append(typeOfClassWhereScriptsAreLocated)
-                .ToString());
-        }
-
-        string[] resourceNames = assembly.GetManifestResourceNames();
-        return resourceNames;
-    }
-
     private static string RemoveTheNamespaceFromName(string filename)
     {
         string[] split = filename.Split(".");

EasyDbMigrator/DatabaseConnectors/MicrosoftSqlConnector.cs

@@ -5,7 +5,6 @@
 using Polly;
 using System;
 using System.Data;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -14,7 +13,6 @@ namespace EasyDbMigrator.DatabaseConnectors;
 /// <summary>
 /// MicrosoftSqlConnector
 /// </summary>
-[ExcludeFromCodeCoverage] //is tested with integrationTest that will not be included in code coverage
 public sealed class MicrosoftSqlConnector : IDatabaseConnector
 {
     private readonly AsyncPolicy _sqlDatabasePolicy = Policy.Handle<Exception>()
@@ -41,7 +39,6 @@ ALTER DATABASE {migrationConfiguration.DatabaseName}
                 ";
 
         var result = await TryExecuteSingleScriptAsync(connectionString: migrationConfiguration.ConnectionString
-               , scriptName: "EasyDbMigrator.Integrationtest_dropDatabase"
                , sqlScriptContent: query
                , cancellationToken: cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
@@ -70,7 +67,6 @@ Version nvarchar(10) NOT NULL
                 END";
 
         var result = await TryExecuteSingleScriptAsync(connectionString: migrationConfiguration.ConnectionString
-            , scriptName: "EasyDbMigrator.SetupDbMigrationsRunTable"
             , sqlScriptContent: sqlScriptCreateMigrationTable
             , cancellationToken: cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
@@ -93,7 +89,6 @@ CREATE DATABASE {migrationConfiguration.DatabaseName}
                 END";
 
         var result = await TryExecuteSingleScriptAsync(connectionString: migrationConfiguration.ConnectionString
-            , scriptName: "SetupEmptyDb"
             , sqlScriptContent: sqlScriptCreateDatabase
             , cancellationToken: cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
@@ -192,7 +187,6 @@ INSERT INTO DbMigrationsRun (Executed, Filename, version)
         }
     }
     private async Task<Result<bool>> TryExecuteSingleScriptAsync(string connectionString
-      , string scriptName
       , string sqlScriptContent
       , CancellationToken cancellationToken)
     {
@@ -203,11 +197,6 @@ private async Task<Result<bool>> TryExecuteSingleScriptAsync(string connectionSt
 
         try
         {
-            if (string.IsNullOrWhiteSpace(value: sqlScriptContent))
-            {
-                throw new ArgumentException(message: $"{scriptName} script is empty, is there something wrong?");
-            }
-
             await _sqlDatabasePolicy.ExecuteAsync(action: async () =>
             {
                 await using SqlConnection connection = new(connectionString: connectionString);