10
10
using AngleSharp . Html ;
11
11
using HtmlGenerationWebSite ;
12
12
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 ;
13
17
using Xunit ;
18
+ using Xunit . Abstractions ;
14
19
using Xunit . Sdk ;
15
20
16
21
namespace Microsoft . AspNetCore . Mvc . FunctionalTests
17
22
{
18
- public class HtmlGenerationWithCultureTest : IClassFixture < MvcTestFixture < StartupWithCultureReplace > >
23
+ public class HtmlGenerationWithCultureTest : LoggedTest , IClassFixture < MvcTestFixture < StartupWithCultureReplace > >
19
24
{
20
- public HtmlGenerationWithCultureTest ( MvcTestFixture < StartupWithCultureReplace > fixture )
25
+ public HtmlGenerationWithCultureTest (
26
+ ITestOutputHelper testOutputHelper ,
27
+ MvcTestFixture < StartupWithCultureReplace > fixture ) : base ( testOutputHelper )
21
28
{
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 ( ) ;
24
31
}
25
32
33
+ public WebApplicationFactory < StartupWithCultureReplace > Factory { get ; }
34
+
26
35
public HttpClient Client { get ; }
27
36
28
37
[ Fact ]
@@ -122,12 +131,17 @@ void ReadValuesFromDocument()
122
131
public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions ( )
123
132
{
124
133
// Arrange
134
+ var client = Factory
135
+ . WithWebHostBuilder ( builder => builder
136
+ . UseStartup < StartupWithCultureReplace > ( )
137
+ . ConfigureTestServices ( services => services . AddSingleton ( LoggerFactory ) ) )
138
+ . CreateDefaultClient ( ) ;
125
139
string culture ;
126
140
string correlationId ;
127
141
string cachedCorrelationId ;
128
142
129
143
// 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" ) ;
131
145
ReadValuesFromDocument ( ) ;
132
146
133
147
// Assert - 1
@@ -136,7 +150,7 @@ public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions()
136
150
Assert . Equal ( "10" , cachedCorrelationId ) ;
137
151
138
152
// 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" ) ;
140
154
ReadValuesFromDocument ( ) ;
141
155
142
156
// Assert - 2
@@ -146,7 +160,7 @@ public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions()
146
160
Assert . Equal ( "11" , cachedCorrelationId ) ;
147
161
148
162
// 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" ) ;
150
164
ReadValuesFromDocument ( ) ;
151
165
152
166
// Assert - 3
0 commit comments