Skip to content

Commit e808b74

Browse files
DamianEdwardsDamianEdwards
committed
Ported more test changes from main
1 parent 02eb61a commit e808b74

File tree

7 files changed

+125
-61
lines changed

7 files changed

+125
-61
lines changed

‎src/ProjectTemplates/test/BlazorServerTemplateTest.cs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,32 @@ public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory)
2929
[Fact]
3030
public Task BlazorServerTemplateWorks_ProgamMainNoAuth() => CreateBuildPublishAsync(args: new [] { ArgConstants.UseProgramMain });
3131

32-
[Theory]
32+
[ConditionalTheory]
3333
[InlineData("Individual", null)]
34-
[InlineData("Individual", new string[] { ArgConstants.UseLocalDb })]
3534
[InlineData("Individual", new string[] { ArgConstants.UseProgramMain })]
36-
[InlineData("Individual", new string[] { ArgConstants.UseProgramMain, ArgConstants.UseLocalDb })]
3735
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
3836
public Task BlazorServerTemplateWorks_IndividualAuth(string auth, string[] args) => CreateBuildPublishAsync(auth, args: args);
3937

38+
[ConditionalTheory]
39+
[InlineData("Individual", new string[] { ArgConstants.UseLocalDb })]
40+
[InlineData("Individual", new string[] { ArgConstants.UseProgramMain, ArgConstants.UseLocalDb })]
41+
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
42+
public Task BlazorServerTemplateWorks_IndividualAuth_LocalDb(string auth, string[] args) => CreateBuildPublishAsync(auth, args: args);
43+
4044
[Theory]
4145
[InlineData("IndividualB2C", null)]
4246
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain })]
4347
[InlineData("IndividualB2C", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
4448
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
49+
public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish_IndividualB2C(string auth, string[] args) => CreateBuildPublishAsync(auth, args);
50+
51+
[Theory]
4552
[InlineData("SingleOrg", null)]
4653
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain })]
4754
[InlineData("SingleOrg", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
4855
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
4956
[InlineData("SingleOrg", new[] { ArgConstants.CallsGraph })]
5057
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CallsGraph })]
51-
public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish(string auth, string[] args)
52-
=> CreateBuildPublishAsync(auth, args);
58+
public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish_SingleOrg(string auth, string[] args) => CreateBuildPublishAsync(auth, args);
5359
}
5460
}

‎src/ProjectTemplates/test/BlazorWasmTemplateTest.cs‎

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public async Task BlazorWasmStandaloneTemplate_IndividualAuth_CreateBuildPublish
158158
});
159159
}
160160

161-
public static TheoryData<TemplateInstance> TemplateData => new TheoryData<TemplateInstance>
161+
public static TheoryData<TemplateInstance> TemplateDataIndividualB2C => new TheoryData<TemplateInstance>
162162
{
163163
new TemplateInstance(
164164
"blazorwasmhostedaadb2c", "-ho",
@@ -181,6 +181,25 @@ public async Task BlazorWasmStandaloneTemplate_IndividualAuth_CreateBuildPublish
181181
ArgConstants.AppIdUri, "ApiUri",
182182
ArgConstants.AppIdClientId, "1234123413241324",
183183
ArgConstants.UseProgramMain),
184+
new TemplateInstance(
185+
"blazorwasmstandaloneaadb2c",
186+
ArgConstants.Auth, "IndividualB2C",
187+
ArgConstants.AadB2cInstance, "example.b2clogin.com",
188+
"-ssp", "b2c_1_siupin",
189+
ArgConstants.ClientId, "clientId",
190+
ArgConstants.Domain, "my-domain"),
191+
new TemplateInstance(
192+
"blazorwasmstandaloneaadb2c_program_main",
193+
ArgConstants.Auth, "IndividualB2C",
194+
ArgConstants.AadB2cInstance, "example.b2clogin.com",
195+
"-ssp", "b2c_1_siupin",
196+
ArgConstants.ClientId, "clientId",
197+
ArgConstants.Domain, "my-domain",
198+
ArgConstants.UseProgramMain),
199+
};
200+
201+
public static TheoryData<TemplateInstance> TemplateDataSingleOrg => new TheoryData<TemplateInstance>
202+
{
184203
new TemplateInstance(
185204
"blazorwasmhostedaad", "-ho",
186205
ArgConstants.Auth, "SingleOrg",
@@ -191,29 +210,39 @@ public async Task BlazorWasmStandaloneTemplate_IndividualAuth_CreateBuildPublish
191210
ArgConstants.AppIdUri, "ApiUri",
192211
ArgConstants.AppIdClientId, "1234123413241324"),
193212
new TemplateInstance(
194-
"blazorwasmhostedaad_program_main", "-ho",
213+
"blazorwasmhostedaadgraph", "-ho",
195214
ArgConstants.Auth, "SingleOrg",
215+
ArgConstants.CallsGraph,
196216
ArgConstants.Domain, "my-domain",
197217
ArgConstants.TenantId, "tenantId",
198218
ArgConstants.ClientId, "clientId",
199219
ArgConstants.DefaultScope, "full",
200220
ArgConstants.AppIdUri, "ApiUri",
201-
ArgConstants.AppIdClientId, "1234123413241324",
202-
ArgConstants.UseProgramMain),
221+
ArgConstants.AppIdClientId, "1234123413241324"),
203222
new TemplateInstance(
204-
"blazorwasmhostedaadgraph", "-ho",
223+
"blazorwasmhostedaadapi", "-ho",
205224
ArgConstants.Auth, "SingleOrg",
206-
ArgConstants.CallsGraph,
225+
ArgConstants.CalledApiUrl, "\"https://graph.microsoft.com\"",
226+
ArgConstants.CalledApiScopes, "user.readwrite",
207227
ArgConstants.Domain, "my-domain",
208228
ArgConstants.TenantId, "tenantId",
209229
ArgConstants.ClientId, "clientId",
210230
ArgConstants.DefaultScope, "full",
211231
ArgConstants.AppIdUri, "ApiUri",
212232
ArgConstants.AppIdClientId, "1234123413241324"),
213233
new TemplateInstance(
214-
"blazorwasmhostedaadgraph_program_main", "-ho",
234+
"blazorwasmstandaloneaad",
235+
ArgConstants.Auth, "SingleOrg",
236+
ArgConstants.Domain, "my-domain",
237+
ArgConstants.TenantId, "tenantId",
238+
ArgConstants.ClientId, "clientId"),
239+
};
240+
241+
public static TheoryData<TemplateInstance> TemplateDataSingleOrgProgramMain => new TheoryData<TemplateInstance>
242+
{
243+
new TemplateInstance(
244+
"blazorwasmhostedaad_program_main", "-ho",
215245
ArgConstants.Auth, "SingleOrg",
216-
ArgConstants.CallsGraph,
217246
ArgConstants.Domain, "my-domain",
218247
ArgConstants.TenantId, "tenantId",
219248
ArgConstants.ClientId, "clientId",
@@ -222,16 +251,16 @@ public async Task BlazorWasmStandaloneTemplate_IndividualAuth_CreateBuildPublish
222251
ArgConstants.AppIdClientId, "1234123413241324",
223252
ArgConstants.UseProgramMain),
224253
new TemplateInstance(
225-
"blazorwasmhostedaadapi", "-ho",
254+
"blazorwasmhostedaadgraph_program_main", "-ho",
226255
ArgConstants.Auth, "SingleOrg",
227-
ArgConstants.CalledApiUrl, "\"https://graph.microsoft.com\"",
228-
ArgConstants.CalledApiScopes, "user.readwrite",
256+
ArgConstants.CallsGraph,
229257
ArgConstants.Domain, "my-domain",
230258
ArgConstants.TenantId, "tenantId",
231259
ArgConstants.ClientId, "clientId",
232260
ArgConstants.DefaultScope, "full",
233261
ArgConstants.AppIdUri, "ApiUri",
234-
ArgConstants.AppIdClientId, "1234123413241324"),
262+
ArgConstants.AppIdClientId, "1234123413241324",
263+
ArgConstants.UseProgramMain),
235264
new TemplateInstance(
236265
"blazorwasmhostedaadapi_program_main", "-ho",
237266
ArgConstants.Auth, "SingleOrg",
@@ -244,27 +273,6 @@ public async Task BlazorWasmStandaloneTemplate_IndividualAuth_CreateBuildPublish
244273
ArgConstants.AppIdUri, "ApiUri",
245274
ArgConstants.AppIdClientId, "1234123413241324",
246275
ArgConstants.UseProgramMain),
247-
new TemplateInstance(
248-
"blazorwasmstandaloneaadb2c",
249-
ArgConstants.Auth, "IndividualB2C",
250-
ArgConstants.AadB2cInstance, "example.b2clogin.com",
251-
"-ssp", "b2c_1_siupin",
252-
ArgConstants.ClientId, "clientId",
253-
ArgConstants.Domain, "my-domain"),
254-
new TemplateInstance(
255-
"blazorwasmstandaloneaadb2c_program_main",
256-
ArgConstants.Auth, "IndividualB2C",
257-
ArgConstants.AadB2cInstance, "example.b2clogin.com",
258-
"-ssp", "b2c_1_siupin",
259-
ArgConstants.ClientId, "clientId",
260-
ArgConstants.Domain, "my-domain",
261-
ArgConstants.UseProgramMain),
262-
new TemplateInstance(
263-
"blazorwasmstandaloneaad",
264-
ArgConstants.Auth, "SingleOrg",
265-
ArgConstants.Domain, "my-domain",
266-
ArgConstants.TenantId, "tenantId",
267-
ArgConstants.ClientId, "clientId"),
268276
new TemplateInstance(
269277
"blazorwasmstandaloneaad_program_main",
270278
ArgConstants.Auth, "SingleOrg",
@@ -287,8 +295,18 @@ public TemplateInstance(string name, params string[] arguments)
287295
}
288296

289297
[Theory]
290-
[MemberData(nameof(TemplateData))]
291-
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_Works(TemplateInstance instance)
298+
[MemberData(nameof(TemplateDataIndividualB2C))]
299+
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_IndividualB2C_Works(TemplateInstance instance)
300+
=> CreateBuildPublishAsync(args: instance.Arguments, targetFramework: "netstandard2.1");
301+
302+
[Theory]
303+
[MemberData(nameof(TemplateDataSingleOrg))]
304+
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_Works(TemplateInstance instance)
305+
=> CreateBuildPublishAsync(args: instance.Arguments, targetFramework: "netstandard2.1");
306+
307+
[Theory]
308+
[MemberData(nameof(TemplateDataSingleOrgProgramMain))]
309+
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_ProgramMain_Works(TemplateInstance instance)
292310
=> CreateBuildPublishAsync(args: instance.Arguments, targetFramework: "netstandard2.1");
293311

294312
private string ReadFile(string basePath, string path)

‎src/ProjectTemplates/test/MvcTemplateTest.cs‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,19 @@ private async Task MvcTemplateCore(string languageOverride, string[] args = null
120120
}
121121

122122
[ConditionalTheory]
123-
[InlineData(true, false)]
124-
[InlineData(true, true)]
125-
[InlineData(false, false)]
126-
[InlineData(false, true)]
123+
[InlineData(false)]
124+
[InlineData(true)]
127125
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
128-
public async Task MvcTemplate_IndividualAuth(bool useLocalDB, bool useProgramMain)
126+
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
127+
public Task MvcTemplate_IndividualAuth_LocalDb(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
128+
129+
[ConditionalTheory]
130+
[InlineData(false)]
131+
[InlineData(true)]
132+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
133+
public Task MvcTemplate_IndividualAuth(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
134+
135+
private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
129136
{
130137
var project = await ProjectFactory.CreateProject(Output);
131138

@@ -295,13 +302,17 @@ public async Task MvcTemplate_SingleFileExe()
295302
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain })]
296303
[InlineData("IndividualB2C", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
297304
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
305+
public Task MvcTemplate_IdentityWeb_IndividualB2C_BuildsAndPublishes(string auth, string[] args) => MvcTemplateBuildsAndPublishes(auth: auth, args: args);
306+
307+
[ConditionalTheory]
308+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
298309
[InlineData("SingleOrg", null)]
299310
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain })]
300311
[InlineData("SingleOrg", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
301312
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
302313
[InlineData("SingleOrg", new[] { ArgConstants.CallsGraph })]
303314
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CallsGraph })]
304-
public Task MvcTemplate_IdentityWeb_BuildsAndPublishes(string auth, string[] args) => MvcTemplateBuildsAndPublishes(auth: auth, args: args);
315+
public Task MvcTemplate_IdentityWeb_SingleOrg_BuildsAndPublishes(string auth, string[] args) => MvcTemplateBuildsAndPublishes(auth: auth, args: args);
305316

306317
private async Task<Project> MvcTemplateBuildsAndPublishes(string auth, string[] args)
307318
{

‎src/ProjectTemplates/test/ProjectTemplates.Tests.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
2020
<TestPackageRestorePath>$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\</TestPackageRestorePath>
2121
<TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
22+
<SkipHelixQueues>
23+
$(HelixQueueArmDebian11);
24+
</SkipHelixQueues>
2225
</PropertyGroup>
2326

2427
<ItemGroup>

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,19 @@ public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
107107
}
108108

109109
[ConditionalTheory]
110-
[InlineData(false, false)]
111-
[InlineData(false, true)]
112-
[InlineData(true, false)]
113-
[InlineData(true, true)]
114-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
115-
public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB, bool useProgramMain)
110+
[InlineData(false)]
111+
[InlineData(true)]
112+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
113+
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
114+
public Task RazorPagesTemplate_IndividualAuth_LocalDb(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
115+
116+
[ConditionalTheory]
117+
[InlineData(false)]
118+
[InlineData(true)]
119+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
120+
public Task RazorPagesTemplate_IndividualAuth(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
121+
122+
private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
116123
{
117124
var project = await ProjectFactory.CreateProject(Output);
118125

@@ -234,16 +241,20 @@ public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB, bool usePro
234241
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain })]
235242
[InlineData("IndividualB2C", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
236243
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
244+
public Task RazorPagesTemplate_IdentityWeb_IndividualB2C_BuildsAndPublishes(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
245+
246+
[ConditionalTheory]
247+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
237248
[InlineData("SingleOrg", null)]
238249
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain })]
239250
[InlineData("SingleOrg", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
240251
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
241-
public Task RazorPagesTemplate_IdentityWeb_BuildsAndPublishes(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
252+
public Task RazorPagesTemplate_IdentityWeb_SingleOrg_BuildsAndPublishes(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
242253

243254
[ConditionalTheory]
244255
[InlineData("SingleOrg", new[] { ArgConstants.CallsGraph })]
245256
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain, ArgConstants.CallsGraph })]
246-
public Task RazorPagesTemplate_IdentityWeb_BuildsAndPublishes_WithSingleOrg(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
257+
public Task RazorPagesTemplate_IdentityWeb_SingleOrg_CallsGraph_BuildsAndPublishes(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
247258

248259
private async Task<Project> BuildAndPublishRazorPagesTemplate(string auth, string[] args)
249260
{

0 commit comments

Comments
 (0)