(#173) Fixes to the AzureSQL and PgSQL test suite to accommodate changes

Author: Adrian Hall

tests/CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test/AzureSqlEntityTableRepository_Tests.cs

@@ -36,7 +36,7 @@ public AzureSqlEntityTableRepository_Tests(DatabaseFixture fixture, ITestOutputH
     protected override bool CanRunLiveTests() => !string.IsNullOrEmpty(this.connectionString);
 
     protected override async Task<AzureSqlEntityMovie> GetEntityAsync(string id)
-        => await Context.Movies.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id);
+        => (await Context.Movies.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id)).Clone();
 
     protected override Task<int> GetEntityCountAsync()
         => Task.FromResult(Context.Movies.Count());

tests/CommunityToolkit.Datasync.TestCommon/FluentExtensions/HttpExceptionAssertions.cs

@@ -14,9 +14,16 @@ public static class FluentHttpExceptionAssertions
     /// <summary>
     /// An extension to FluentAssertions to validate the payload of a <see cref="HttpException"/>.
     /// </summary>
-    public static AndConstraint<ExceptionAssertions<HttpException>> WithPayload(this ExceptionAssertions<HttpException> current, object payload, string because = "", params object[] becauseArgs)
+    public static AndConstraint<ExceptionAssertions<HttpException>> WithPayload(this ExceptionAssertions<HttpException> current, object expectedPayload, string because = "", params object[] becauseArgs)
     {
-        current.Subject.First().Payload.Should().NotBeNull().And.BeEquivalentTo(payload, because, becauseArgs);
+        object actualPayload = current.Subject.First().Payload;
+        actualPayload.Should().NotBeNull();
+
+        // The UpdatedAt field should be within 1msec of the subject.
+        actualPayload.Should().BeEquivalentTo(expectedPayload, options => options
+            .Using<DateTimeOffset>(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromMilliseconds(1)))
+            .WhenTypeIs<DateTimeOffset>(), because, becauseArgs);
+
         return new AndConstraint<ExceptionAssertions<HttpException>>(current);
     }
 

tests/CommunityToolkit.Datasync.TestCommon/RepositoryTests.cs

@@ -125,17 +125,19 @@ public async Task CreateAsync_CreatesNewEntity_WithSpecifiedId()
     {
         Skip.IfNot(CanRunLiveTests());
 
+        DateTimeOffset dto = DateTimeOffset.Now;
         IRepository<TEntity> Repository = await GetPopulatedRepositoryAsync();
         string id = await GetRandomEntityIdAsync(false);
         TEntity addition = TestData.Movies.OfType<TEntity>(TestData.Movies.BlackPanther, id);
         TEntity sut = addition.Clone();
         await Repository.CreateAsync(sut);
+
         TEntity actual = await GetEntityAsync(id);
 
         actual.Should().BeEquivalentTo<IMovie>(addition);
         actual.Should().NotBeEquivalentTo<ITableData>(addition).And.HaveEquivalentMetadataTo(sut);
         actual.Id.Should().Be(id);
-        actual.UpdatedAt.Should().BeAfter(StartTime);
+        actual.UpdatedAt?.Ticks.Should().BeGreaterThan(dto.Ticks);
         actual.Version.Should().NotBeNullOrEmpty();
     }
 
@@ -146,6 +148,7 @@ public async Task CreateAsync_CreatesNewEntity_WithNullId(string id)
     {
         Skip.IfNot(CanRunLiveTests());
 
+        DateTimeOffset dto = DateTimeOffset.Now;
         IRepository<TEntity> Repository = await GetPopulatedRepositoryAsync();
         TEntity addition = TestData.Movies.OfType<TEntity>(TestData.Movies.BlackPanther);
         addition.Id = id;
@@ -154,7 +157,7 @@ public async Task CreateAsync_CreatesNewEntity_WithNullId(string id)
         TEntity actual = await GetEntityAsync(sut.Id);
 
         actual.Should().BeEquivalentTo<IMovie>(addition);
-        actual.UpdatedAt.Should().BeAfter(StartTime);
+        actual.UpdatedAt?.Ticks.Should().BeGreaterThan(dto.Ticks);
     }
 
     [SkippableFact]
@@ -177,6 +180,7 @@ public async Task CreateAsync_UpdatesMetadata()
     {
         Skip.IfNot(CanRunLiveTests());
 
+        DateTimeOffset dto = DateTimeOffset.Now;
         IRepository<TEntity> Repository = await GetPopulatedRepositoryAsync();
         string id = await GetRandomEntityIdAsync(false);
         TEntity addition = TestData.Movies.OfType<TEntity>(TestData.Movies.BlackPanther, id);
@@ -190,7 +194,7 @@ public async Task CreateAsync_UpdatesMetadata()
         actual.Should().BeEquivalentTo<IMovie>(addition);
         actual.Should().NotBeEquivalentTo<ITableData>(addition).And.HaveEquivalentMetadataTo(sut);
         actual.Id.Should().Be(id);
-        actual.UpdatedAt.Should().BeAfter(StartTime);
+        actual.UpdatedAt?.Ticks.Should().BeGreaterThan(dto.Ticks);
         actual.Version.Should().NotBeEquivalentTo(expectedVersion);
     }
 
@@ -295,7 +299,9 @@ public async Task ReadAsync_ReturnsDisconnectedEntity()
         TEntity expected = await GetEntityAsync(id);
         TEntity actual = await Repository.ReadAsync(id);
 
-        actual.Should().BeEquivalentTo(expected).And.NotBeSameAs(expected);
+        actual.Should().BeEquivalentTo<IMovie>(expected);
+        actual.Should().HaveEquivalentMetadataTo(expected);
+        actual.Should().NotBeSameAs(expected);
     }
 
     [SkippableTheory]
@@ -373,6 +379,7 @@ public async Task ReplaceAsync_Replaces_OnVersionMatch()
     {
         Skip.IfNot(CanRunLiveTests());
 
+        DateTimeOffset dto = DateTimeOffset.Now;
         IRepository<TEntity> Repository = await GetPopulatedRepositoryAsync();
         string id = await GetRandomEntityIdAsync(true);
         TEntity replacement = TestData.Movies.OfType<TEntity>(TestData.Movies.BlackPanther, id);
@@ -383,14 +390,15 @@ public async Task ReplaceAsync_Replaces_OnVersionMatch()
 
         actual.Should().BeEquivalentTo<IMovie>(replacement).And.NotBeEquivalentTo<ITableData>(expected);
         actual.Version.Should().NotBeEquivalentTo(version);
-        actual.UpdatedAt.Should().BeAfter(StartTime);
+        actual.UpdatedAt?.Ticks.Should().BeGreaterThan(dto.Ticks);
     }
 
     [SkippableFact]
     public async Task ReplaceAsync_Replaces_OnNoVersion()
     {
         Skip.IfNot(CanRunLiveTests());
 
+        DateTimeOffset dto = DateTimeOffset.Now;
         IRepository<TEntity> Repository = await GetPopulatedRepositoryAsync();
         string id = await GetRandomEntityIdAsync(true);
         TEntity replacement = TestData.Movies.OfType<TEntity>(TestData.Movies.BlackPanther, id);
@@ -401,7 +409,8 @@ public async Task ReplaceAsync_Replaces_OnNoVersion()
 
         actual.Should().BeEquivalentTo<IMovie>(replacement).And.NotBeEquivalentTo<ITableData>(expected);
         actual.Version.Should().NotBeEquivalentTo(version);
-        actual.UpdatedAt.Should().BeAfter(StartTime);
+        actual.UpdatedAt?.Ticks.Should().BeGreaterThan(dto.Ticks);
+
     }
     #endregion
 }