Skip to content
This repository was archived by the owner on Nov 29, 2018. It is now read-only.

Commit cbba45b

Browse files
ryanbrandenburgryanbrandenburg
committed
Organize Functional tests
1 parent e52cab5 commit cbba45b

2 files changed

Lines changed: 73 additions & 130 deletions

File tree

‎test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,30 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
1111
{
1212
public class LocalizationSampleTest
1313
{
14-
private static readonly string _applicationPath = Path.Combine("samples", "LocalizationSample");
14+
private static readonly string _applicationPath = Path.Combine("samples", "LocalizationSample");
1515

16-
[ConditionalTheory]
16+
[ConditionalFact]
1717
[OSSkipCondition(OperatingSystems.Linux)]
1818
[OSSkipCondition(OperatingSystems.MacOSX)]
19-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x64)]
20-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)]
21-
public Task RunSite_WindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture)
19+
public Task RunSite_WindowsOnly()
2220
{
2321
var testRunner = new TestRunner(_applicationPath);
2422
return testRunner.RunTestAndVerifyResponseHeading(
25-
runtimeFlavor,
26-
runtimeArchitecture,
27-
applicationBaseUrl,
23+
RuntimeFlavor.Clr,
24+
RuntimeArchitecture.x64,
25+
"http://localhost:5080",
2826
"My/Resources",
2927
"fr-FR",
3028
"<h1>Bonjour</h1>");
3129
}
32-
33-
[ConditionalTheory]
34-
[OSSkipCondition(OperatingSystems.Windows)]
35-
//[InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x64)] // Disabled due to https://github.com/dotnet/corefx/issues/9012
36-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)]
37-
public Task RunSite_NonWindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture)
30+
[Fact]
31+
public Task RunSite_AnyOS()
3832
{
3933
var testRunner = new TestRunner(_applicationPath);
4034
return testRunner.RunTestAndVerifyResponseHeading(
41-
runtimeFlavor,
42-
runtimeArchitecture,
43-
applicationBaseUrl,
35+
RuntimeFlavor.CoreClr,
36+
RuntimeArchitecture.x64,
37+
"http://localhost:5081/",
4438
"My/Resources",
4539
"fr-FR",
4640
"<h1>Bonjour</h1>");

‎test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs‎

Lines changed: 62 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class LocalizationTest
1414
private static readonly string _applicationPath = Path.Combine("test", "LocalizationWebsite");
1515

1616
[Fact]
17-
public Task Localization_CustomCulture()
17+
public Task Localization_CustomCulture_AllOS()
1818
{
1919
var testRunner = new TestRunner(_applicationPath);
2020
return testRunner.RunTestAndVerifyResponse(
@@ -26,207 +26,156 @@ public Task Localization_CustomCulture()
2626
"kr10.00");
2727
}
2828

29-
[ConditionalTheory]
29+
[ConditionalFact]
3030
[OSSkipCondition(OperatingSystems.Linux)]
3131
[OSSkipCondition(OperatingSystems.MacOSX)]
32-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
33-
public Task Localization_ResourcesInClassLibrary_ReturnLocalizedValue_Windows(
34-
RuntimeFlavor runtimeFlavor,
35-
string applicationBaseUrl,
36-
RuntimeArchitecture runtimeArchitecture)
32+
public Task Localization_CustomCulture_Windows()
3733
{
3834
var testRunner = new TestRunner(_applicationPath);
3935
return testRunner.RunTestAndVerifyResponse(
40-
runtimeFlavor,
41-
runtimeArchitecture,
42-
applicationBaseUrl,
43-
"ResourcesInClassLibrary",
44-
"fr-FR",
45-
"Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryWithAttribute Bonjour from ResourcesClassLibraryWithAttribute");
36+
RuntimeFlavor.Clr,
37+
RuntimeArchitecture.x64,
38+
"http://localhost:5071",
39+
"CustomCulturePreserved",
40+
"en-US",
41+
"kr10.00");
4642
}
4743

48-
[Theory]
49-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
50-
public Task Localization_ResourcesInClassLibrary_ReturnLocalizedValue_AllOS(
51-
RuntimeFlavor runtimeFlavor,
52-
string applicationBaseUrl,
53-
RuntimeArchitecture runtimeArchitecture)
44+
[Fact]
45+
public Task Localization_ResourcesInClassLibrary_ReturnLocalizedValue_AllOS()
5446
{
5547
var testRunner = new TestRunner(_applicationPath);
5648
return testRunner.RunTestAndVerifyResponse(
57-
runtimeFlavor,
58-
runtimeArchitecture,
59-
applicationBaseUrl,
49+
RuntimeFlavor.CoreClr,
50+
RuntimeArchitecture.x64,
51+
"http://localhost:5072",
6052
"ResourcesInClassLibrary",
6153
"fr-FR",
6254
"Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryWithAttribute Bonjour from ResourcesClassLibraryWithAttribute");
6355
}
6456

65-
[ConditionalTheory]
57+
[ConditionalFact]
6658
[OSSkipCondition(OperatingSystems.Linux)]
6759
[OSSkipCondition(OperatingSystems.MacOSX)]
68-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
69-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
70-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Windows(
71-
RuntimeFlavor runtimeFlavor,
72-
string applicationBaseUrl,
73-
RuntimeArchitecture runtimeArchitecture)
60+
public Task Localization_ResourcesInClassLibrary_ReturnLocalizedValue_Windows()
7461
{
7562
var testRunner = new TestRunner(_applicationPath);
7663
return testRunner.RunTestAndVerifyResponse(
77-
runtimeFlavor,
78-
runtimeArchitecture,
79-
applicationBaseUrl,
80-
"ResourcesInFolder",
64+
RuntimeFlavor.Clr,
65+
RuntimeArchitecture.x64,
66+
"http://localhost:5073",
67+
"ResourcesInClassLibrary",
8168
"fr-FR",
82-
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
69+
"Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryNoAttribute Bonjour from ResourcesClassLibraryWithAttribute Bonjour from ResourcesClassLibraryWithAttribute");
8370
}
8471

85-
[ConditionalTheory]
86-
[OSSkipCondition(OperatingSystems.Linux)]
87-
[OSSkipCondition(OperatingSystems.MacOSX)]
88-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
89-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
90-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Windows(
91-
RuntimeFlavor runtimeFlavor,
92-
string applicationBaseUrl,
93-
RuntimeArchitecture runtimeArchitecture)
72+
[Fact]
73+
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_AllOS()
9474
{
9575
var testRunner = new TestRunner(_applicationPath);
9676
return testRunner.RunTestAndVerifyResponse(
97-
runtimeFlavor,
98-
runtimeArchitecture,
99-
applicationBaseUrl,
77+
RuntimeFlavor.CoreClr,
78+
RuntimeArchitecture.x64,
79+
"http://localhost:5074",
10080
"ResourcesInFolder",
101-
"fr-FR-test",
81+
"fr-FR",
10282
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
10383
}
10484

105-
[ConditionalTheory]
85+
[ConditionalFact]
10686
[OSSkipCondition(OperatingSystems.Linux)]
10787
[OSSkipCondition(OperatingSystems.MacOSX)]
108-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
109-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
110-
public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_Windows(
111-
RuntimeFlavor runtimeFlavor,
112-
string applicationBaseUrl,
113-
RuntimeArchitecture runtimeArchitecture)
114-
{
115-
var testRunner = new TestRunner(_applicationPath);
116-
return testRunner.RunTestAndVerifyResponse(
117-
runtimeFlavor,
118-
runtimeArchitecture,
119-
applicationBaseUrl,
120-
"ResourcesInFolder",
121-
"fr-FR-test-again-too-deep-to-work",
122-
"Hello Hello Hello Hello");
123-
}
124-
125-
[ConditionalFact]
126-
[OSSkipCondition(OperatingSystems.Windows)]
127-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
128-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Clr()
88+
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Windows()
12989
{
13090
var testRunner = new TestRunner(_applicationPath);
13191
return testRunner.RunTestAndVerifyResponse(
13292
RuntimeFlavor.Clr,
13393
RuntimeArchitecture.x64,
134-
"http://localhost:5072",
94+
"http://localhost:5075/",
13595
"ResourcesInFolder",
13696
"fr-FR",
13797
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
13898
}
13999

140-
[ConditionalFact]
141-
[OSSkipCondition(OperatingSystems.Windows)]
142-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
143-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Clr()
100+
[Fact]
101+
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_AllOS()
144102
{
145103
var testRunner = new TestRunner(_applicationPath);
146104
return testRunner.RunTestAndVerifyResponse(
147-
RuntimeFlavor.Clr,
105+
RuntimeFlavor.CoreClr,
148106
RuntimeArchitecture.x64,
149-
"http://localhost:5072",
107+
"http://localhost:5076",
150108
"ResourcesInFolder",
151109
"fr-FR-test",
152110
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
153111
}
154112

155113
[ConditionalFact]
156-
[OSSkipCondition(OperatingSystems.Windows)]
157-
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
158-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_CoreCLR_NonWindows()
114+
[OSSkipCondition(OperatingSystems.Linux)]
115+
[OSSkipCondition(OperatingSystems.MacOSX)]
116+
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Windows()
159117
{
160118
var testRunner = new TestRunner(_applicationPath);
161119
return testRunner.RunTestAndVerifyResponse(
162-
RuntimeFlavor.CoreClr,
120+
RuntimeFlavor.Clr,
163121
RuntimeArchitecture.x64,
164-
"http://localhost:5073/",
122+
"http://localhost:5077",
165123
"ResourcesInFolder",
166-
"fr-FR",
124+
"fr-FR-test",
167125
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
168126
}
169127

170-
[ConditionalFact]
171-
[OSSkipCondition(OperatingSystems.Windows)]
172-
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
173-
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_CoreCLR_NonWindows()
128+
[Fact]
129+
public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_AllOS()
174130
{
175131
var testRunner = new TestRunner(_applicationPath);
176132
return testRunner.RunTestAndVerifyResponse(
177133
RuntimeFlavor.CoreClr,
178134
RuntimeArchitecture.x64,
179-
"http://localhost:5073/",
135+
"http://localhost:5078/",
180136
"ResourcesInFolder",
181-
"fr-FR-test",
182-
"Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Bonjour from Test in resources folder");
137+
"fr-FR-test-again-too-deep-to-work",
138+
"Hello Hello Hello Hello");
183139
}
184140

185-
[ConditionalTheory]
141+
[ConditionalFact]
186142
[OSSkipCondition(OperatingSystems.Linux)]
187143
[OSSkipCondition(OperatingSystems.MacOSX)]
188-
[InlineData(RuntimeFlavor.Clr, "http://localhost:5074/", RuntimeArchitecture.x64)]
189-
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5075/", RuntimeArchitecture.x64)]
190-
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Windows(
191-
RuntimeFlavor runtimeFlavor,
192-
string applicationBaseUrl,
193-
RuntimeArchitecture runtimeArchitecture)
144+
public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_Windows()
194145
{
195146
var testRunner = new TestRunner(_applicationPath);
196147
return testRunner.RunTestAndVerifyResponse(
197-
runtimeFlavor,
198-
runtimeArchitecture,
199-
applicationBaseUrl,
200-
"ResourcesAtRootFolder",
201-
"fr-FR",
202-
"Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in Models folder");
148+
RuntimeFlavor.Clr,
149+
RuntimeArchitecture.x64,
150+
"http://localhost:5079/",
151+
"ResourcesInFolder",
152+
"fr-FR-test-again-too-deep-to-work",
153+
"Hello Hello Hello Hello");
203154
}
204155

205-
[ConditionalFact]
206-
[OSSkipCondition(OperatingSystems.Windows)]
207-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
208-
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Clr()
156+
[Fact]
157+
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_AllOS()
209158
{
210159
var testRunner = new TestRunner(_applicationPath);
211160
return testRunner.RunTestAndVerifyResponse(
212-
RuntimeFlavor.Clr,
161+
RuntimeFlavor.CoreClr,
213162
RuntimeArchitecture.x64,
214-
"http://localhost:5076",
163+
"http://localhost:5070",
215164
"ResourcesAtRootFolder",
216165
"fr-FR",
217166
"Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in Models folder");
218167
}
219168

220169
[ConditionalFact]
221-
[OSSkipCondition(OperatingSystems.Windows)]
222-
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
223-
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_CoreCLR_NonWindows()
170+
[OSSkipCondition(OperatingSystems.Linux)]
171+
[OSSkipCondition(OperatingSystems.MacOSX)]
172+
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Windows()
224173
{
225174
var testRunner = new TestRunner(_applicationPath);
226175
return testRunner.RunTestAndVerifyResponse(
227-
RuntimeFlavor.CoreClr,
176+
RuntimeFlavor.Clr,
228177
RuntimeArchitecture.x64,
229-
"http://localhost:5077/",
178+
"http://localhost:5071",
230179
"ResourcesAtRootFolder",
231180
"fr-FR",
232181
"Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in Models folder");

0 commit comments

Comments
 (0)