Skip to content

Commit 473c60a

Browse files
committed
Ensure ported tests wait for aspire
1 parent c85405c commit 473c60a

File tree

2 files changed

+41
-5
lines changed

2 files changed

+41
-5
lines changed

tests-integration/Elastic.Assembler.IntegrationTests/AssemblerConfigurationTests.cs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,18 @@ public void ReadsPrivateRepositories()
4747

4848
}
4949

50-
public class AssemblerConfigurationTests
50+
public class AssemblerConfigurationTests : IAsyncLifetime
5151
{
52+
private readonly DocumentationFixture _fixture;
53+
private readonly ITestOutputHelper _output;
5254
private DiagnosticsCollector Collector { get; }
5355
private AssembleContext Context { get; }
5456
private FileSystem FileSystem { get; }
5557
private IDirectoryInfo CheckoutDirectory { get; set; }
56-
public AssemblerConfigurationTests()
58+
public AssemblerConfigurationTests(DocumentationFixture fixture, ITestOutputHelper output)
5759
{
60+
_fixture = fixture;
61+
_output = output;
5862
FileSystem = new FileSystem();
5963
CheckoutDirectory = FileSystem.DirectoryInfo.New(
6064
FileSystem.Path.Combine(Paths.GetSolutionDirectory()!.FullName, ".artifacts", "checkouts")
@@ -120,4 +124,18 @@ public void ReadsVersions()
120124
cloud.GitReferenceCurrent.Should().NotBeNullOrEmpty()
121125
.And.Be("master");
122126
}
127+
128+
/// <inheritdoc />
129+
public ValueTask DisposeAsync()
130+
{
131+
GC.SuppressFinalize(this);
132+
if (TestContext.Current.TestState?.Result is TestResult.Passed)
133+
return default;
134+
foreach (var resource in _fixture.InMemoryLogger.RecordedLogs)
135+
_output.WriteLine(resource.Message);
136+
return default;
137+
}
138+
139+
/// <inheritdoc />
140+
public ValueTask InitializeAsync() => default;
123141
}

tests-integration/Elastic.Assembler.IntegrationTests/GlobalNavigationTests.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,21 @@
1919

2020
namespace Elastic.Assembler.IntegrationTests;
2121

22-
public class GlobalNavigationPathProviderTests
22+
public class GlobalNavigationPathProviderTests : IAsyncLifetime
2323
{
24+
private readonly DocumentationFixture _fixture;
25+
private readonly ITestOutputHelper _output;
2426
private DiagnosticsCollector Collector { get; }
2527
private AssembleContext Context { get; }
2628
private FileSystem FileSystem { get; }
27-
private IDirectoryInfo CheckoutDirectory { get; set; }
29+
private IDirectoryInfo CheckoutDirectory { get; }
2830

2931
private bool HasCheckouts() => CheckoutDirectory.Exists;
3032

31-
public GlobalNavigationPathProviderTests()
33+
public GlobalNavigationPathProviderTests(DocumentationFixture fixture, ITestOutputHelper output)
3234
{
35+
_fixture = fixture;
36+
_output = output;
3337
FileSystem = new FileSystem();
3438
var checkoutDirectory = FileSystem.DirectoryInfo.New(
3539
FileSystem.Path.Combine(Paths.GetSolutionDirectory()!.FullName, ".artifacts", "checkouts")
@@ -303,4 +307,18 @@ public async Task UriResolving()
303307
resolvedUri = uriResolver.Resolve(new Uri("elasticsearch://extend/c/file.md"), "/extend/c/file");
304308
resolvedUri.Should().Be("https://www.elastic.co/docs/extend/elasticsearch/c/file");
305309
}
310+
311+
/// <inheritdoc />
312+
public ValueTask DisposeAsync()
313+
{
314+
GC.SuppressFinalize(this);
315+
if (TestContext.Current.TestState?.Result is TestResult.Passed)
316+
return default;
317+
foreach (var resource in _fixture.InMemoryLogger.RecordedLogs)
318+
_output.WriteLine(resource.Message);
319+
return default;
320+
}
321+
322+
/// <inheritdoc />
323+
public ValueTask InitializeAsync() => default;
306324
}

0 commit comments

Comments
 (0)