cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-19 12:04:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

ValueTask a bunch of Database Functions

Browse Source
This commit is contained in:
Dominion
2023-06-14 00:59:34 -04:00
parent 764724664c
commit 71753f5a44
20 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Host.Tests/Components/Chat/Providers/TestDiscordProvider.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers.Tests
mockSetup
.Setup(x => x.RegisterOperation(It.IsNotNull<Job>(), It.IsNotNull<JobEntrypoint>(), It.IsAny<CancellationToken>()))
.Callback<Job, JobEntrypoint, CancellationToken>((job, entrypoint, cancellationToken) => job.StartedBy ??= new User { })
.Returns(Task.CompletedTask);
.Returns(ValueTask.CompletedTask);
mockSetup
.Setup(x => x.WaitForJobCompletion(It.IsNotNull<Job>(), It.IsAny<User>(), It.IsAny<CancellationToken>(), It.IsAny<CancellationToken>()))
.Returns(Task.CompletedTask);
tests/Tgstation.Server.Host.Tests/Components/Chat/Providers/TestIrcProvider.cs
+1 -1
View File
@@ -73,7 +73,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers.Tests
mockSetup
.Setup(x => x.RegisterOperation(It.IsNotNull<Job>(), It.IsNotNull<JobEntrypoint>(), It.IsAny<CancellationToken>()))
.Callback<Job, JobEntrypoint, CancellationToken>((job, entrypoint, cancellationToken) => job.StartedBy ??= new User { })
.Returns(Task.CompletedTask);
.Returns(ValueTask.CompletedTask);
mockSetup
.Setup(x => x.WaitForJobCompletion(It.IsNotNull<Job>(), It.IsAny<User>(), It.IsAny<CancellationToken>(), It.IsAny<CancellationToken>()))
.Returns(Task.CompletedTask);
tests/Tgstation.Server.Host.Tests/Database/TestDatabaseContextFactory.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System;
@@ -41,12 +41,12 @@ namespace Tgstation.Server.Host.Database.Tests
var factory = new DatabaseContextFactory(mockScopeFactory.Object);
await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => factory.UseContext(null));
await Assert.ThrowsExceptionAsync<ArgumentNullException>(async () => await factory.UseContext(null));
await factory.UseContext(context =>
{
Assert.AreSame(mockDbo, context);
return Task.CompletedTask;
return ValueTask.CompletedTask;
});
mockScopeFactory.VerifyAll();
tests/Tgstation.Server.Host.Tests/Swarm/TestableSwarmNode.cs
+8 -4
View File
@@ -51,7 +51,7 @@ namespace Tgstation.Server.Host.Swarm.Tests
readonly Mock<IHttpClient> mockHttpClient;
readonly Mock<IDatabaseContextFactory> mockDBContextFactory;
readonly Mock<IDatabaseSeeder> mockDatabaseSeeder;
readonly ISetup<IDatabaseSeeder, Task> mockDatabaseSeederInitialize;
readonly ISetup<IDatabaseSeeder, ValueTask> mockDatabaseSeederInitialize;
readonly Action recreateControllerAndService;
@@ -95,7 +95,7 @@ namespace Tgstation.Server.Host.Swarm.Tests
mockDatabaseSeederInitialize = new Mock<IDatabaseSeeder>().Setup(x => x.Initialize(mockDatabaseContext, It.IsAny<CancellationToken>()));
mockDBContextFactory = new Mock<IDatabaseContextFactory>();
mockDBContextFactory
.Setup(x => x.UseContext(It.IsNotNull<Func<IDatabaseContext, Task>>()))
.Setup(x => x.UseContext(It.IsNotNull<Func<IDatabaseContext, ValueTask>>()))
.Callback<Func<IDatabaseContext, Task>>((func) => func(mockDatabaseContext));
var mockHttpClientFactory = new Mock<IAbstractHttpClientFactory>();
@@ -226,9 +226,13 @@ namespace Tgstation.Server.Host.Swarm.Tests
Assert.Fail("Initialized twice!");
if (!cancel)
mockDatabaseSeederInitialize.Returns(Task.CompletedTask).Verifiable();
mockDatabaseSeederInitialize.Returns(ValueTask.CompletedTask).Verifiable();
else
mockDatabaseSeederInitialize.ThrowsAsync(new TaskCanceledException()).Verifiable();
mockDatabaseSeederInitialize.Returns(async () =>
{
await Task.Yield();
throw new TaskCanceledException();
}).Verifiable();
Task<SwarmRegistrationResult> Invoke() => Service.Initialize(default);
tests/Tgstation.Server.Tests/TestDatabase.cs
+1 -1
View File
@@ -73,7 +73,7 @@ namespace Tgstation.Server.Tests
return null;
}
using var context = CreateContext();
await using var context = CreateContext();
await context.Database.EnsureDeletedAsync();
await context.Database.MigrateAsync(default);