Skip to content

Caitie/update test templates #10662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 2, 2025
Merged

Caitie/update test templates #10662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f55478
updating test templates to dispose of resources correctly
CaitieM20 Jul 24, 2025
1d79c1b
comment out code
CaitieM20 Jul 24, 2025
2322000
making sure comment lines weren't unnecessarily changed
CaitieM20 Jul 24, 2025
70df939
Update src/Aspire.ProjectTemplates/templates/aspire-xunit/9.4/Integra…
CaitieM20 Jul 25, 2025
65cfe38
integrating feedback
CaitieM20 Jul 25, 2025
561824a
updating feedback changes
CaitieM20 Jul 25, 2025
c1352e1
Merge remote-tracking branch 'origin/main' into caitie/updateTestTemp…
radical Sep 2, 2025
77eed9f
Add missing tests for 9.4
radical Sep 2, 2025
1709477
cleanup
radical Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-mstest/9.4/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ namespace Aspire.Tests._1;
[TestClass]
public class IntegrationTest1
{
public TestContext TestContext { get; set; }

private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(30);

// Instructions:
Expand All @@ -20,7 +22,7 @@ public class IntegrationTest1
// public async Task GetWebResourceRootReturnsOkStatusCode()
// {
// // Arrange
// var cancellationToken = new CancellationTokenSource(DefaultTimeout).Token;
// var cancellationToken = TestContext.CancellationTokenSource.Token;
// var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.MyAspireApp_AppHost>();
// appHost.Services.AddLogging(logging =>
// {
Expand All @@ -38,9 +40,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
Expand Down
7 changes: 4 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-mstest/9.5/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Aspire.Tests._1;
[TestClass]
public class IntegrationTest1
{
public TestContext TestContext { get; set; }
private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(30);

// Instructions:
Expand All @@ -20,7 +21,7 @@ public class IntegrationTest1
// public async Task GetWebResourceRootReturnsOkStatusCode()
// {
// // Arrange
// var cancellationToken = new CancellationTokenSource(DefaultTimeout).Token;
// var cancellationToken = TestContext.CancellationTokenSource.Token;
// var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.MyAspireApp_AppHost>();
// appHost.Services.AddLogging(logging =>
// {
Expand All @@ -38,9 +39,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
Expand Down
7 changes: 4 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-nunit/9.4/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class IntegrationTest1
// public async Task GetWebResourceRootReturnsOkStatusCode()
// {
// // Arrange
// var cancellationToken = TestContext.CurrentContext.CancellationToken;
// using var cts = new CancellationTokenSource(DefaultTimeout);
// var cancellationToken = cts.Token;
// var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.MyAspireApp_AppHost>();
// appHost.Services.AddLogging(logging =>
// {
Expand All @@ -37,9 +38,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
Expand Down
7 changes: 4 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-nunit/9.5/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class IntegrationTest1
// public async Task GetWebResourceRootReturnsOkStatusCode()
// {
// // Arrange
// var cancellationToken = TestContext.CurrentContext.CancellationToken;
// using var cts = new CancellationTokenSource(DefaultTimeout);
// var cancellationToken = cts.Token;
// var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.MyAspireApp_AppHost>();
// appHost.Services.AddLogging(logging =>
// {
Expand All @@ -37,9 +38,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
Expand Down
6 changes: 3 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-xunit/9.4/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class IntegrationTest1
// {
// // Arrange
#if (XUnitVersion == "v2")
// var cancellationToken = new CancellationTokenSource(DefaultTimeout).Token;
// var cancellationToken = CancellationToken.None;
#else // XunitVersion v3 or v3mtp
// var cancellationToken = TestContext.Current.CancellationToken;
#endif
Expand All @@ -42,9 +42,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Expand Down
6 changes: 3 additions & 3 deletions src/Aspire.ProjectTemplates/templates/aspire-xunit/9.5/IntegrationTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class IntegrationTest1
// {
// // Arrange
#if (XUnitVersion == "v2")
// var cancellationToken = new CancellationTokenSource(DefaultTimeout).Token;
// var cancellationToken = CancellationToken.None;
#else // XunitVersion v3 or v3mtp
// var cancellationToken = TestContext.Current.CancellationToken;
#endif
Expand All @@ -42,9 +42,9 @@ public class IntegrationTest1
// await app.StartAsync(cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
//
// // Act
// var httpClient = app.CreateHttpClient("webfrontend");
// using var httpClient = app.CreateHttpClient("webfrontend");
// await app.ResourceNotifications.WaitForResourceHealthyAsync("webfrontend", cancellationToken).WaitAsync(DefaultTimeout, cancellationToken);
// var response = await httpClient.GetAsync("/", cancellationToken);
// using var response = await httpClient.GetAsync("/", cancellationToken);
//
// // Assert
// Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Expand Down
60 changes: 27 additions & 33 deletions tests/Aspire.Templates.Tests/NewUpAndBuildSupportProjectTemplatesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ namespace Aspire.Templates.Tests;

public abstract class NewUpAndBuildSupportProjectTemplatesBase(ITestOutputHelper testOutput) : TemplateTestsBase(testOutput)
{
public const string AspireVersionNext = "9.5";

[Trait("category", "basic-build")]
protected async Task CanNewAndBuildActual(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
Expand Down Expand Up @@ -61,7 +63,7 @@ protected async Task CanNewAndBuildActual(string templateName, string extraTestC
}
}

public class NUnit_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
public class NUnit_AspireVersionCurrent_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-nunit", ""])]
Expand All @@ -71,12 +73,18 @@ public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, Te
}
}

public class XUnit_Default_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class NUnit_AspireVersionNext_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_Default_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-nunit", $"--aspire-version {AspireVersionNext}"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
return CanNewAndBuildActual(templateName, extraTestCreationArgs, sdk, tfm, error);
}
}

public class XUnit_Default_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", ""])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
Expand All @@ -85,12 +93,8 @@ public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, Te
}
}

public class XUnit_V2_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class XUnit_V2_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_V2_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
{
}

[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", "--xunit-version v2"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
Expand All @@ -99,12 +103,8 @@ public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, Te
}
}

public class XUnit_V3_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class XUnit_V3_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_V3_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
{
}

[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", "--xunit-version v3"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
Expand All @@ -113,12 +113,8 @@ public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, Te
}
}

public class XUnit_V3MTP_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class XUnit_V3MTP_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_V3MTP_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
{
}

[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", "--xunit-version v3mtp"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
Expand All @@ -127,42 +123,40 @@ public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, Te
}
}

public class XUnit_AspireVersion93_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class XUnit_AspireVersion_Current_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_AspireVersion93_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
{
}

[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", "--aspire-version 9.4"])]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", ""])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
return CanNewAndBuildActual(templateName, extraTestCreationArgs, sdk, tfm, error);
}
}

public class XUnit_AspireVersion94_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class XUnit_AspireVersion_Next_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public XUnit_AspireVersion94_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
{
}

[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", "--aspire-version 9.5"])]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-xunit", $"--aspire-version {AspireVersionNext}"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
return CanNewAndBuildActual(templateName, extraTestCreationArgs, sdk, tfm, error);
}
}

public class MSTest_NewUpAndBuildSupportProjectTemplatesTests : NewUpAndBuildSupportProjectTemplatesBase
public class MSTest_AspireVersionCurrent_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
public MSTest_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : base(testOutput)
[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-mstest", ""])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
return CanNewAndBuildActual(templateName, extraTestCreationArgs, sdk, tfm, error);
}
}

public class MSTest_AspireVersionNext_NewUpAndBuildSupportProjectTemplatesTests(ITestOutputHelper testOutput) : NewUpAndBuildSupportProjectTemplatesBase(testOutput)
{
[Theory]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-mstest", ""])]
[MemberData(nameof(TestDataForNewAndBuildTemplateTests), arguments: ["aspire-mstest", $"--aspire-version {AspireVersionNext}"])]
public Task CanNewAndBuild(string templateName, string extraTestCreationArgs, TestSdk sdk, TestTargetFramework tfm, string? error)
{
return CanNewAndBuildActual(templateName, extraTestCreationArgs, sdk, tfm, error);
Expand Down