Skip to content

Commit ae3b4ed

Browse files
josephdecockjosephdecock
authored
Merge pull request #285 from DuendeSoftware/jmdc/reenable-tests
Reenable temporarily disabled tests
2 parents f8f426c + 0faa1d4 commit ae3b4ed

File tree

7 files changed

+62
-23
lines changed

7 files changed

+62
-23
lines changed

‎.github/workflow-gen/Program.cs‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@
4343
GenerateReleaseWorkflow(component);
4444
}
4545

46-
//**********************************************************************
47-
// Temporarily disabling tests because of mutual test dependencies.
48-
//**********************************************************************
49-
//
50-
// GenerateUploadTestResultsWorkflow();
46+
GenerateUploadTestResultsWorkflow();
5147

5248

5349
void GenerateCiWorkflow(Component component)
@@ -113,23 +109,20 @@ void GenerateCiWorkflow(Component component)
113109

114110
job.StepVerifyFormatting();
115111

116-
//**********************************************************************
117-
// Temporarily disabling tests because of mutual test dependencies.
118-
//**********************************************************************
119-
//
120-
// var runsOnIncludesWindows = component.RunsOn.Contains(GitHubHostedRunners.WindowsLatest);
121-
// foreach (var testProject in component.Tests)
122-
// {
123-
// job.StepTest(component.Name, testProject, runsOnIncludesWindows);
124-
//
125-
// if (runsOnIncludesWindows)
126-
// {
127-
// job.StepTest(component.Name, testProject, false, "net481");
128-
// }
129-
// }
130-
//
131-
// job.StepUploadTestResultsAsArtifact(component, runsOnIncludesWindows);
132-
//
112+
var runsOnIncludesWindows = component.RunsOn.Contains(GitHubHostedRunners.WindowsLatest);
113+
foreach (var testProject in component.Tests)
114+
{
115+
job.StepTest(component.Name, testProject, runsOnIncludesWindows);
116+
117+
// Temporarily disabled
118+
// if (runsOnIncludesWindows)
119+
// {
120+
// job.StepTest(component.Name, testProject, false, "net481");
121+
// }
122+
}
123+
124+
job.StepUploadTestResultsAsArtifact(component, runsOnIncludesWindows);
125+
133126
// if (runsOnIncludesWindows)
134127
// {
135128
// job.StepUploadTestResultsAsArtifact(component, false, "net481");

‎.github/workflows/access-token-management-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
run: dotnet restore ../
5555
- name: Verify Formatting
5656
run: dotnet format ../ --verify-no-changes --no-restore
57+
- name: Test - AccessTokenManagement.Tests
58+
run: dotnet test -c Release test/AccessTokenManagement.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=AccessTokenManagement.Tests.trx" --collect:"XPlat Code Coverage"
59+
- name: Test report
60+
if: success() || failure()
61+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
62+
with:
63+
name: test-results
64+
path: access-token-management/test/AccessTokenManagement.Tests/TestResults/AccessTokenManagement.Tests.trx
65+
retention-days: 5
5766
- name: Tool restore
5867
run: dotnet tool restore
5968
- name: Pack AccessTokenManagement

‎.github/workflows/identity-model-ci.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ jobs:
6060
run: dotnet restore ../
6161
- name: Verify Formatting
6262
run: dotnet format ../ --verify-no-changes --no-restore
63+
- name: Test - IdentityModel.Tests
64+
if: matrix.os != 'windows-latest'
65+
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IdentityModel.Tests.trx" --collect:"XPlat Code Coverage"
66+
- name: Test report
67+
if: matrix.os != 'windows-latest'
68+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
69+
with:
70+
name: test-results
71+
path: identity-model/test/IdentityModel.Tests/TestResults/IdentityModel.Tests.trx
72+
retention-days: 5
6373
- name: Tool restore
6474
run: dotnet tool restore
6575
- name: Pack IdentityModel

‎.github/workflows/identity-model-oidc-client-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
run: dotnet restore ../
5555
- name: Verify Formatting
5656
run: dotnet format ../ --verify-no-changes --no-restore
57+
- name: Test - IdentityModel.OidcClient.Tests
58+
run: dotnet test -c Release test/IdentityModel.OidcClient.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IdentityModel.OidcClient.Tests.trx" --collect:"XPlat Code Coverage"
59+
- name: Test report
60+
if: success() || failure()
61+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
62+
with:
63+
name: test-results
64+
path: identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/TestResults/IdentityModel.OidcClient.Tests.trx
65+
retention-days: 5
5766
- name: Tool restore
5867
run: dotnet tool restore
5968
- name: Pack IdentityModel.OidcClient

‎.github/workflows/ignore-this-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
run: dotnet restore ../
5555
- name: Verify Formatting
5656
run: dotnet format ../ --verify-no-changes --no-restore
57+
- name: Test - IgnoreThis.Tests
58+
run: dotnet test -c Release test/IgnoreThis.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IgnoreThis.Tests.trx" --collect:"XPlat Code Coverage"
59+
- name: Test report
60+
if: success() || failure()
61+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
62+
with:
63+
name: test-results
64+
path: ignore-this/test/IgnoreThis.Tests/TestResults/IgnoreThis.Tests.trx
65+
retention-days: 5
5766
- name: Tool restore
5867
run: dotnet tool restore
5968
- name: Pack IgnoreThis

‎.github/workflows/introspection-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
run: dotnet restore ../
5555
- name: Verify Formatting
5656
run: dotnet format ../ --verify-no-changes --no-restore
57+
- name: Test - AspNetCore.Authentication.OAuth2Introspection.Tests
58+
run: dotnet test -c Release test/AspNetCore.Authentication.OAuth2Introspection.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=AspNetCore.Authentication.OAuth2Introspection.Tests.trx" --collect:"XPlat Code Coverage"
59+
- name: Test report
60+
if: success() || failure()
61+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
62+
with:
63+
name: test-results
64+
path: introspection/test/AspNetCore.Authentication.OAuth2Introspection.Tests/TestResults/AspNetCore.Authentication.OAuth2Introspection.Tests.trx
65+
retention-days: 5
5766
- name: Tool restore
5867
run: dotnet tool restore
5968
- name: Pack AspNetCore.Authentication.OAuth2Introspection

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageVersion Include="AngleSharp" Version="1.3.0" />
1717
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1818
<PackageVersion Include="Duende.IdentityModel" Version="8.0.0-preview.1" />
19-
<PackageVersion Include="Duende.IdentityServer" Version="7.3.1" />
19+
<PackageVersion Include="Duende.IdentityServer" Version="7.4.0-preview.2" />
2020
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
2121
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
2222
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersion)" />

0 commit comments

Comments
 (0)