Improving test coverage #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

bfren merged 12 commits into main from 531-improve-test-coverage

Jan 30, 2026

.editorconfig

-Original file line number
+Diff line change
@@ Expand Up @@
     # 'using' directive preferences
     csharp_using_directive_placement = outside_namespace:warning
+    # CS8625: Cannot convert null literal to non-nullable reference type.
+    dotnet_diagnostic.CS8625.severity = error
     ##########################################
     # Disable various diagnostics
@@ Expand Down @@

Directory.Packages.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -31,7 +31,7 @@
  
        <PackageVersion Include="Npgsql" Version="10.0.1" />

        <PackageVersion Include="NSubstitute" Version="5.3.0" />

        <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />

        <PackageVersion Include="Rnd" Version="10.1.2" />

        <PackageVersion Include="Rnd" Version="10.2.0" />

        <PackageVersion Include="Serilog" Version="4.3.0" />

        <PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />

        <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />

    @@ -45,10 +45,10 @@
  
        <PackageVersion Include="System.Data.SQLite.Core" Version="1.0.119" />

        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />

        <PackageVersion Include="System.Text.Json" Version="10.0.2" />

        <PackageVersion Include="Wrap" Version="1.0.0" />

        <PackageVersion Include="Wrap.Id.Dapper" Version="1.0.0" />

        <PackageVersion Include="Wrap.Id.Mvc" Version="1.0.0" />

        <PackageVersion Include="Wrap.Testing" Version="1.0.0" />

        <PackageVersion Include="Wrap" Version="1.1.0-beta.4" />

        <PackageVersion Include="Wrap.Id.Dapper" Version="1.1.0-beta.4" />

        <PackageVersion Include="Wrap.Id.Mvc" Version="1.1.0-beta.4" />

        <PackageVersion Include="Wrap.Testing" Version="1.1.0-beta.4" />

        <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

        <PackageVersion Include="xunit.v3" Version="3.2.2" />

        <PackageVersion Include="xunit.v3.assert" Version="3.2.2" />

apps/AppConsolePg/Db.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     using Jeebs.Data;
     using Jeebs.Logging;
     using Microsoft.Extensions.Options;
-    using Wrap.Extensions;
     namespace AppConsolePg;
@@ Expand Down @@

src/Jeebs.Data/Query/FluentQuery.Sort.cs

-Original file line number
+Diff line change
@@ Expand Up @@
     		aliasSelector.GetPropertyInfo()
     			.Match(
     				some: x => Sort(x.Name, order),
-    				none: this
+    				none: () => this
     			);
     }

src/Jeebs.Data/Query/FluentQuery.Where.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -72,7 +72,7 @@ public IFluentQuery<TEntity, TId> Where<TValue>(Expression<Func<TEntity, TValue>
  
    		aliasSelector.GetPropertyInfo()

    			.Match(

    				some: x => Where(x.Name, compare, value),

    				none: this

    				none: () => this

    			);

    	/// <inheritdoc/>

    @@ -105,7 +105,7 @@ public IFluentQuery<TEntity, TId> WhereIn<TValue>(Expression<Func<TEntity, TValu
  
    		aliasSelector.GetPropertyInfo()

    			.Match(

    				some: x => WhereIn(x.Name, values),

    				none: this

    				none: () => this

    			);

    	/// <inheritdoc/>

    @@ -124,6 +124,6 @@ public IFluentQuery<TEntity, TId> WhereNotIn<TValue>(Expression<Func<TEntity, TV
  
    		aliasSelector.GetPropertyInfo()

    			.Match(

    				some: x => WhereNotIn(x.Name, values),

    				none: this

    				none: () => this

    			);

    }

src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ public MySqlLogger(string name) => @@
     	public bool IsEnabled(MySqlConnectorLogLevel level) =>
     		LevelF.ConvertToSerilogLevel(level).Match(
     			some: Logger.IsEnabled,
-    			none: false
+    			none: () => false
     		);
     	/// <summary>
@@ Expand Down @@

src/Jeebs/Config/App/AppConfig.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     // Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
     using System;
-    using Jeebs.Functions;
     using Microsoft.Extensions.Options;
     namespace Jeebs.Config.App;
@@ Expand Down Expand Up / @@ -32,7 +31,7 @@ public sealed record class AppConfig : IOptions<AppConfig> @@
     	/// otherwise simply <see cref="Name"/>.
     	/// </summary>
     	public string FullName =>
-    		StringF.Format("{0}/", Suite, string.Empty) + Name;
+    		F.Format("{0}/", Suite, string.Empty) + Name;
     	/// <summary>
     	/// Application Version.
@@ Expand Down @@

src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,13 +1,11 @@
  
    // Jeebs Rapid Application Development

    // Copyright (c) bfren - licensed under https://mit.bfren.dev/2013

    using Jeebs.Functions;

    namespace Jeebs;

    public static partial class StringExtensions

    {

    	/// <inheritdoc cref="StringF.Format{T}(string, T)"/>

    	/// <inheritdoc cref="F.Format{T}(string, T)"/>

    	public static string FormatWith<T>(this string @this, T source) =>

    		Modify(@this, () => StringF.Format(@this, source));

    		Modify(@this, () => F.Format(@this, source));

    }

src/Jeebs/Functions/String/StringF.Format.cs

This file was deleted.

src/Jeebs/Functions/StringF.cs

This file was deleted.

tests/.editorconfig

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,9 @@ dotnet_diagnostic.IDE0053.severity = none @@
     # IDE0058: Expression value is never used
     dotnet_diagnostic.IDE0058.severity = none
+    # IDE0290: Use primary constructor
+    dotnet_diagnostic.IDE0290.severity = none
     # IDE1006: Naming Styles
     dotnet_diagnostic.IDE1006.severity = none
@@ Expand Down @@

tests/Directory.Build.props

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,9 @@ @@
         <Using Include="Xunit" />
       </ItemGroup>
       <ItemGroup>
-        <Using Include="Wrap.Testing.IdGenerator" Alias="IdGen" />
         <Using Include="Wrap.Testing.FailureGenerator" Alias="FailGen" />
+        <Using Include="Wrap.Testing.IdGenerator" Alias="IdGen" />
+        <Using Include="Wrap.Testing.NoneGenerator" Alias="NoneGen" />
       </ItemGroup>
       <ItemGroup>
         <PackageReference Include="coverlet.collector">
@@ Expand All / @@ -38,4 +39,4 @@ @@
         </PackageReference>
         <PackageReference Include="xunit.v3" />
       </ItemGroup>
-    </Project>
+    </Project>

tests/Tests.Jeebs.Data.Clients.MySql/_/CompareExtensions/ToOperator_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
  
    		var value = (Compare)input;

    		// Act

    		var action = void () => value.ToOperator();

    		var result = Record.Exception(() => value.ToOperator());

    		// Assert

    		Assert.Throws<UnrecognisedSearchOperatorException>(action);

    		Assert.IsType<UnrecognisedSearchOperatorException>(result);

    	}

    }

tests/Tests.Jeebs.Data.Clients.MySql/_/MySqlDbClient/GetQuery_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
  
    	{

    		// Arrange

    		var (client, v) = MySqlDbClient_Setup.Get();

    		var max = Rnd.ULng;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Maximum = max };

    		var expected = $"SELECT * FROM `{v.Schema}.{v.Name}` LIMIT {max};";

    @@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
  
    	{

    		// Arrange

    		var (client, v) = MySqlDbClient_Setup.Get();

    		var skip = Rnd.ULng;

    		var max = Rnd.ULng;

    		var skip = Rnd.UInt64;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };

    		var expected = $"SELECT * FROM `{v.Schema}.{v.Name}` LIMIT {skip}, {max};";

tests/Tests.Jeebs.Data.Clients.PostgreSql/TypeHandlers/Json/Parse_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,10 +18,10 @@ public void Null_Or_Whitespace_Throws_JsonException(string input)
  
    		var handler = new JsonbTypeHandler<Test>();

    		// Act

    		var action = void () => handler.Parse(input);

    		var result = Record.Exception(() => handler.Parse(input));

    		// Assert

    		Assert.Throws<JsonException>(action);

    		Assert.IsType<JsonException>(result);

    	}

    	[Fact]

    @@ -32,10 +32,10 @@ public void InvalidJson_Throws_JsonException()
  
    		var input = Rnd.Str;

    		// Act

    		var action = void () => handler.Parse(input);

    		var result = Record.Exception(() => handler.Parse(input));

    		// Assert

    		var ex = Assert.Throws<FailureException>(action);

    		var ex = Assert.IsType<FailureException>(result);

    		Assert.IsType<JsonException>(ex.InnerException);

    	}

tests/Tests.Jeebs.Data.Clients.PostgreSql/_/CompareExtensions/ToOperator_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
  
    		var value = (Compare)input;

    		// Act

    		var action = void () => value.ToOperator();

    		var result = Record.Exception(() => value.ToOperator());

    		// Assert

    		Assert.Throws<UnrecognisedSearchOperatorException>(action);

    		Assert.IsType<UnrecognisedSearchOperatorException>(result);

    	}

    }

tests/Tests.Jeebs.Data.Clients.PostgreSql/_/PostgreSqlDbClient/GetQuery_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
  
    	{

    		// Arrange

    		var (client, v) = PostgreSqlDbClient_Setup.Get();

    		var max = Rnd.ULng;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Maximum = max };

    		var expected = $"SELECT * FROM {v.Schema}.{v.Name} LIMIT {max};";

    @@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
  
    	{

    		// Arrange

    		var (client, v) = PostgreSqlDbClient_Setup.Get();

    		var skip = Rnd.ULng;

    		var max = Rnd.ULng;

    		var skip = Rnd.UInt64;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };

    		var expected = $"SELECT * FROM {v.Schema}.{v.Name} LIMIT {max} OFFSET {skip};";

tests/Tests.Jeebs.Data.Clients.SqlServer/_/CompareExtensions/ToOperator_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
  
    		var value = (Compare)input;

    		// Act

    		var action = void () => value.ToOperator();

    		var result = Record.Exception(() => value.ToOperator());

    		// Assert

    		Assert.Throws<UnrecognisedSearchOperatorException>(action);

    		Assert.IsType<UnrecognisedSearchOperatorException>(result);

    	}

    }

tests/Tests.Jeebs.Data.Clients.SqlServer/_/SqlServerDbClient/GetQuery_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
  
    	{

    		// Arrange

    		var (client, v) = SqlServerDbClient_Setup.Get();

    		var max = Rnd.ULng;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Maximum = max };

    		var expected = $"SELECT * FROM [{v.Schema}].[{v.Name}] OFFSET 0 ROWS FETCH NEXT {max} ROWS ONLY";

    @@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
  
    	{

    		// Arrange

    		var (client, v) = SqlServerDbClient_Setup.Get();

    		var skip = Rnd.ULng;

    		var max = Rnd.ULng;

    		var skip = Rnd.UInt64;

    		var max = Rnd.UInt64;

    		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };

    		var expected = $"SELECT * FROM [{v.Schema}].[{v.Name}] OFFSET {skip} ROWS FETCH NEXT {max} ROWS ONLY";

tests/Tests.Jeebs.Data.Clients.Sqlite/_/CompareExtensions/ToOperator_Tests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
  
    		var value = (Compare)input;

    		// Act

    		var action = void () => value.ToOperator();

    		var result = Record.Exception(() => value.ToOperator());

    		// Assert

    		Assert.Throws<UnrecognisedSearchOperatorException>(action);

    		Assert.IsType<UnrecognisedSearchOperatorException>(result);

    	}

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improving test coverage #533

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!