Skip to content

Commit 4b5f44f

Browse files
authored
Improved asynchronous code in Marten tests (#7747)
1 parent 2f07470 commit 4b5f44f

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/HotChocolate/Marten/test/Data.Marten.Filters.Tests/FilterVisitorTestBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
2828
where T : FilterInputType<TEntity>
2929
{
3030
var dbName = $"DB_{Guid.NewGuid():N}";
31-
Container.Resource.CreateDatabaseAsync(dbName).GetAwaiter().GetResult();
31+
await Container.Resource.CreateDatabaseAsync(dbName);
3232
var store = DocumentStore.For(Container.Resource.GetConnectionString(dbName));
3333

3434
var resolver = await BuildResolverAsync(store, entities);
@@ -56,7 +56,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
5656

5757
var schema = builder.Create();
5858

59-
return new ServiceCollection()
59+
return await new ServiceCollection()
6060
.Configure<RequestExecutorSetup>(
6161
Schema.DefaultName,
6262
o => o.Schema = schema)
@@ -79,8 +79,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
7979
.Services
8080
.BuildServiceProvider()
8181
.GetRequiredService<IRequestExecutorResolver>()
82-
.GetRequestExecutorAsync()
83-
.Result;
82+
.GetRequestExecutorAsync();
8483
}
8584

8685
private void ApplyConfigurationToField<TEntity, TType>(

src/HotChocolate/Marten/test/Data.Marten.Sorting.Tests/SortVisitorTestBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
8787
where T : SortInputType<TEntity>
8888
{
8989
var dbName = $"DB_{Guid.NewGuid():N}";
90-
Container.Resource.CreateDatabaseAsync(dbName).GetAwaiter().GetResult();
90+
await Container.Resource.CreateDatabaseAsync(dbName);
9191
var store = DocumentStore.For(Container.Resource.GetConnectionString(dbName));
9292

9393
var resolver = await BuildResolverAsync(store, entities);
@@ -113,7 +113,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
113113

114114
var schema = builder.Create();
115115

116-
return new ServiceCollection()
116+
return await new ServiceCollection()
117117
.Configure<RequestExecutorSetup>(
118118
Schema.DefaultName,
119119
o => o.Schema = schema)
@@ -136,8 +136,7 @@ protected async Task<IRequestExecutor> CreateSchemaAsync<TEntity, T>(
136136
.Services
137137
.BuildServiceProvider()
138138
.GetRequiredService<IRequestExecutorResolver>()
139-
.GetRequestExecutorAsync()
140-
.Result;
139+
.GetRequestExecutorAsync();
141140
}
142141

143142
private void ApplyConfigurationToField<TEntity, TType>(

0 commit comments

Comments
 (0)