cleanup

Author: SimonCropp

readme.md

@@ -7,8 +7,7 @@
 Extends [Verify](https://github.com/VerifyTests/Verify) to allow snapshot testing with EntityFramework.
 
 
-
-## NuGet package
+## NuGet packages
 
  * https://nuget.org/packages/Verify.EntityFramework/
  * https://nuget.org/packages/Verify.EntityFrameworkClassic/
@@ -26,7 +25,7 @@ Enable VerifyEntityFramework once at assembly load time:
 ```cs
 VerifyEntityFramework.Enable();
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L472-L476' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablecore' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L473-L477' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablecore' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -58,7 +57,7 @@ builder.UseSqlServer(connection);
 builder.EnableRecording();
 var data = new SampleDbContext(builder.Options);
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L239-L246' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablerecording' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L235-L242' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablerecording' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 `EnableRecording` should only be called in the test context.
@@ -86,7 +85,7 @@ await data.Companies
 
 await Verify(data.Companies.Count());
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L319-L336' title='Snippet source file'>snippet source</a> | <a href='#snippet-recording' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L315-L332' title='Snippet source file'>snippet source</a> | <a href='#snippet-recording' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Will result in the following verified file:
@@ -143,7 +142,7 @@ await Verify(new
     sql = entries
 });
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L438-L461' title='Snippet source file'>snippet source</a> | <a href='#snippet-recordingspecific' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L439-L462' title='Snippet source file'>snippet source</a> | <a href='#snippet-recordingspecific' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -174,7 +173,7 @@ await data2.Companies
 
 await Verify(data2.Companies.Count());
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L288-L310' title='Snippet source file'>snippet source</a> | <a href='#snippet-multidbcontexts' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L284-L306' title='Snippet source file'>snippet source</a> | <a href='#snippet-multidbcontexts' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 <!-- snippet: CoreTests.MultiDbContexts.verified.txt -->
@@ -275,15 +274,18 @@ public async Task Deleted()
     var options = DbContextOptions();
 
     await using var data = new SampleDbContext(options);
-    data.Add(new Company { Content = "before" });
+    data.Add(new Company
+    {
+        Content = "before"
+    });
     await data.SaveChangesAsync();
 
     var company = data.Companies.Single();
     data.Companies.Remove(company);
     await Verify(data.ChangeTracker);
 }
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L35-L51' title='Snippet source file'>snippet source</a> | <a href='#snippet-deleted' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L35-L54' title='Snippet source file'>snippet source</a> | <a href='#snippet-deleted' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Will result in the following verified file:
@@ -327,7 +329,7 @@ public async Task Modified()
     await Verify(data.ChangeTracker);
 }
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L53-L72' title='Snippet source file'>snippet source</a> | <a href='#snippet-modified' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L56-L75' title='Snippet source file'>snippet source</a> | <a href='#snippet-modified' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Will result in the following verified file:
@@ -362,7 +364,7 @@ var queryable = data.Companies
     .Where(x => x.Content == "value");
 await Verify(queryable);
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L218-L224' title='Snippet source file'>snippet source</a> | <a href='#snippet-queryable' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L214-L220' title='Snippet source file'>snippet source</a> | <a href='#snippet-queryable' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Will result in the following verified file:
@@ -410,7 +412,7 @@ await Verify(data.AllData())
                 serializer =>
                     serializer.TypeNameHandling = TypeNameHandling.Objects));
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L199-L208' title='Snippet source file'>snippet source</a> | <a href='#snippet-alldata' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L196-L205' title='Snippet source file'>snippet source</a> | <a href='#snippet-alldata' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Will result in the following verified file with all data in the database:
@@ -494,32 +496,30 @@ public async Task IgnoreNavigationProperties()
             x => x.IgnoreNavigationProperties(data));
 }
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L74-L97' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorenavigationproperties' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L77-L100' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorenavigationproperties' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
+
 ## WebApplicationFactory
 
-To be able to use [WebApplicationFactory](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.testing.webapplicationfactory-1) for [integration testing](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests)
-an identifier must be used to be able to retrive the recorded commands. Start by enable recording with a unique identifier, for example the test name or a GUID:
+To be able to use [WebApplicationFactory](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.testing.webapplicationfactory-1) for [integration testing](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests)an identifier must be used to be able to retrieve the recorded commands. Start by enable recording with a unique identifier, for example the test name or a GUID:
 
 <!-- snippet: EnableRecordingWithIdentifier -->
 <a id='snippet-enablerecordingwithidentifier'></a>
 ```cs
 .ConfigureTestServices(services =>
 {
-    services.AddScoped<DbContextOptions<SampleDbContext>>(_ =>
-    {
-        return new DbContextOptionsBuilder<SampleDbContext>()
+    services.AddScoped(_ =>
+        new DbContextOptionsBuilder<SampleDbContext>()
             .EnableRecording(testName)
             .UseSqlite($"Data Source={testName};Mode=Memory;Cache=Shared")
-            .Options;
-    });
+            .Options);
 });
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L394-L405' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablerecordingwithidentifier' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L397-L408' title='Snippet source file'>snippet source</a> | <a href='#snippet-enablerecordingwithidentifier' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
-Then use the same identifer for recording:
+Then use the same identifier for recording:
 
 <!-- snippet: RecordWithIdentifier -->
 <a id='snippet-recordwithidentifier'></a>
@@ -532,7 +532,7 @@ var companies = await httpClient.GetFromJsonAsync<Company[]>("/companies");
 
 var entries = EfRecording.FinishRecording(testName);
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L364-L372' title='Snippet source file'>snippet source</a> | <a href='#snippet-recordwithidentifier' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L364-L374' title='Snippet source file'>snippet source</a> | <a href='#snippet-recordwithidentifier' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 The results will not be automatically included in verified file so it will have to be verified manually:
@@ -546,9 +546,10 @@ await Verify(new
     sql = entries
 });
 ```
-<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L374-L380' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyrecordedcommandswithidentifier' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.EntityFramework.Tests/CoreTests.cs#L376-L384' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyrecordedcommandswithidentifier' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
+
 ## Icon
 
 [Database](https://thenounproject.com/term/database/310841/) designed by [Creative Stall](https://thenounproject.com/creativestall/) from [The Noun Project](https://thenounproject.com).

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;CS8632;EF1001</NoWarn>
-    <Version>6.3.1</Version>
+    <Version>6.4.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFramework, Verify</PackageTags>
     <Description>Extends Verify (https://github.com/VerifyTests/Verify) to allow verification of EntityFramework bits.</Description>

src/Verify.EntityFramework.Tests/CoreTests.NestedQueryable.verified.txt

@@ -1,6 +1,3 @@
-{
-  queryable:
-SELECT [c].[Id], [c].[Content]
+SELECT [c].[Id], [c].[Content]
 FROM [Companies] AS [c]
-WHERE [c].[Content] = N'value'
-}
+WHERE [c].[Content] = N'value'

src/Verify.EntityFramework.Tests/CoreTests.cs

@@ -40,7 +40,10 @@ public async Task Deleted()
         var options = DbContextOptions();
 
         await using var data = new SampleDbContext(options);
-        data.Add(new Company { Content = "before" });
+        data.Add(new Company
+        {
+            Content = "before"
+        });
         await data.SaveChangesAsync();
 
         var company = data.Companies.Single();
@@ -140,10 +143,7 @@ public async Task SomePropsModified()
 
     [Test]
     public Task ShouldIgnoreDbFactory() =>
-        Verify(new
-        {
-            Factory = new MyDbContextFactory()
-        });
+        Verify(new MyDbContextFactory());
 
     [Test]
     public Task ShouldIgnoreDbFactoryInterface()
@@ -162,10 +162,7 @@ class TargetWithFactoryInterface
 
     [Test]
     public Task ShouldIgnoreDbContext() =>
-        Verify(new
-        {
-            Factory = new SampleDbContext(new DbContextOptions<SampleDbContext>())
-        });
+        Verify(new SampleDbContext(new DbContextOptions<SampleDbContext>()));
 
     class MyDbContextFactory : IDbContextFactory<SampleDbContext>
     {
@@ -208,7 +205,6 @@ await Verify(data.AllData())
         #endregion
     }
 
-
     [Test]
     public async Task Queryable()
     {
@@ -231,7 +227,7 @@ public async Task NestedQueryable()
         var data = database.Context;
         var queryable = data.Companies
             .Where(x => x.Content == "value");
-        await Verify(new { queryable });
+        await Verify(queryable);
     }
 
     void Build(string connection)
@@ -356,52 +352,59 @@ public async Task RecordingWebApplicationFactory(int run)
 
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(new Company { Id = 1, Content = "Foo" });
+            context.Add(new Company
+            {
+                Id = 1,
+                Content = "Foo"
+            });
 
             await context.SaveChangesAsync();
         }
 
         #region RecordWithIdentifier
+
         var httpClient = factory.CreateClient();
 
         EfRecording.StartRecording(testName);
 
         var companies = await httpClient.GetFromJsonAsync<Company[]>("/companies");
 
         var entries = EfRecording.FinishRecording(testName);
+
         #endregion
 
         #region VerifyRecordedCommandsWithIdentifier
+
         await Verify(new
         {
             target = companies!.Length,
             sql = entries
         });
+
         #endregion
     }
 
     class CustomWebApplicationFactory : WebApplicationFactory<Startup>
     {
         readonly string testName;
 
-        public CustomWebApplicationFactory(string testName)
-        {
+        public CustomWebApplicationFactory(string testName) =>
             this.testName = testName;
-        }
 
         protected override void ConfigureWebHost(IWebHostBuilder builder) =>
             builder
-        #region EnableRecordingWithIdentifier
+
+                #region EnableRecordingWithIdentifier
+
                 .ConfigureTestServices(services =>
                 {
-                    services.AddScoped<DbContextOptions<SampleDbContext>>(_ =>
-                    {
-                        return new DbContextOptionsBuilder<SampleDbContext>()
+                    services.AddScoped(_ =>
+                        new DbContextOptionsBuilder<SampleDbContext>()
                             .EnableRecording(testName)
                             .UseSqlite($"Data Source={testName};Mode=Memory;Cache=Shared")
-                            .Options;
-                    });
+                            .Options);
                 });
+
         #endregion
 
         protected override IHostBuilder CreateHostBuilder() =>
@@ -411,14 +414,12 @@ protected override IHostBuilder CreateHostBuilder() =>
 
     public class Startup
     {
-        public void ConfigureServices(IServiceCollection services)
-        {
+        public void ConfigureServices(IServiceCollection services) =>
             services
                 .AddDbContext<SampleDbContext>(builder =>
                 {
                     builder.UseInMemoryDatabase("");
                 });
-        }
 
         public void Configure(IApplicationBuilder app)
         {

src/Verify.EntityFramework.Tests/Verify.EntityFramework.Tests.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.3.0" PrivateAssets="all" />
-    <PackageReference Include="Verify.NUnit" Version="16.4.2" />
+    <PackageReference Include="Verify.NUnit" Version="16.5.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
     <PackageReference Include="EfLocalDb" Version="13.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />

src/Verify.EntityFramework/LogCommandInterceptor.cs

@@ -26,10 +26,8 @@ class LogCommandInterceptor :
         return state?.OrderBy(x => x.StartTime);
     }
 
-    public LogCommandInterceptor(string? identifier)
-    {
+    public LogCommandInterceptor(string? identifier) =>
         this.identifier = identifier;
-    }
 
     public override void CommandFailed(DbCommand command, CommandErrorEventData data)
         => Add("CommandFailed", command, data, data.Exception);

src/Verify.EntityFramework/Verify.EntityFramework.csproj

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.3" />
-    <PackageReference Include="Verify" Version="16.4.2" />
+    <PackageReference Include="Verify" Version="16.5.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />

src/Verify.EntityFrameworkClassic.Tests/Verify.EntityFrameworkClassic.Tests.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Verify.NUnit" Version="16.4.2" />
+    <PackageReference Include="Verify.NUnit" Version="16.5.4" />
     <PackageReference Include="EfClassicLocalDb" Version="13.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />

src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj

@@ -5,7 +5,7 @@
   <ItemGroup>
     <Using Remove="System.Net.Http" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
-    <PackageReference Include="Verify" Version="16.4.2" />
+    <PackageReference Include="Verify" Version="16.5.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />