Skip to content

Commit afb9201

Browse files
author
N. Taylor Mullen
committed
Produce log output for flakey test.
- For the flakey test replaced the default logger with Xunit's `ITestOutputHelper` in order to see what's going wrong when the flakey test will eventually fail. aspnet/AspNetCore-Internal#1337
1 parent 0ae6cc8 commit afb9201

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,28 @@
1010
using AngleSharp.Html;
1111
using HtmlGenerationWebSite;
1212
using Microsoft.AspNetCore.Hosting;
13+
using Microsoft.AspNetCore.Mvc.Testing;
14+
using Microsoft.AspNetCore.TestHost;
15+
using Microsoft.Extensions.DependencyInjection;
16+
using Microsoft.Extensions.Logging.Testing;
1317
using Xunit;
18+
using Xunit.Abstractions;
1419
using Xunit.Sdk;
1520

1621
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
1722
{
18-
public class HtmlGenerationWithCultureTest : IClassFixture<MvcTestFixture<StartupWithCultureReplace>>
23+
public class HtmlGenerationWithCultureTest : LoggedTest, IClassFixture<MvcTestFixture<StartupWithCultureReplace>>
1924
{
20-
public HtmlGenerationWithCultureTest(MvcTestFixture<StartupWithCultureReplace> fixture)
25+
public HtmlGenerationWithCultureTest(
26+
ITestOutputHelper testOutputHelper,
27+
MvcTestFixture<StartupWithCultureReplace> fixture) : base(testOutputHelper)
2128
{
22-
var factory = fixture.WithWebHostBuilder(builder => builder.UseStartup<StartupWithCultureReplace>());
23-
Client = factory.CreateDefaultClient();
29+
Factory = fixture.WithWebHostBuilder(builder => builder.UseStartup<StartupWithCultureReplace>());
30+
Client = Factory.CreateDefaultClient();
2431
}
2532

33+
public WebApplicationFactory<StartupWithCultureReplace> Factory { get; }
34+
2635
public HttpClient Client { get; }
2736

2837
[Fact]
@@ -122,12 +131,17 @@ void ReadValuesFromDocument()
122131
public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions()
123132
{
124133
// Arrange
134+
var client = Factory
135+
.WithWebHostBuilder(builder => builder
136+
.UseStartup<StartupWithCultureReplace>()
137+
.ConfigureTestServices(services => services.AddSingleton(LoggerFactory)))
138+
.CreateDefaultClient();
125139
string culture;
126140
string correlationId;
127141
string cachedCorrelationId;
128142

129143
// Act - 1
130-
var document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=10");
144+
var document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=10");
131145
ReadValuesFromDocument();
132146

133147
// Assert - 1
@@ -136,7 +150,7 @@ public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions()
136150
Assert.Equal("10", cachedCorrelationId);
137151

138152
// Act - 2
139-
document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=11&varyByQueryKey=new-key");
153+
document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=11&varyByQueryKey=new-key");
140154
ReadValuesFromDocument();
141155

142156
// Assert - 2
@@ -146,7 +160,7 @@ public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions()
146160
Assert.Equal("11", cachedCorrelationId);
147161

148162
// Act - 3
149-
document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=14");
163+
document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=14");
150164
ReadValuesFromDocument();
151165

152166
// Assert - 3

0 commit comments

Comments
 (0)