diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b3e2a1dff..294e26e0b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -6,13 +6,22 @@ "version": "1.10.175", "commands": [ "dotnet-serve" - ] + ], + "rollForward": false }, "docfx": { - "version": "2.76.0", + "version": "2.78.2", "commands": [ "docfx" - ] + ], + "rollForward": false + }, + "dotnet-dump": { + "version": "9.0.553101", + "commands": [ + "dotnet-dump" + ], + "rollForward": false } } } \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 90c45b483..9ec00c266 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,11 +3,11 @@ { "name": "Full", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/dotnet/sdk:9.0-preview", + "image": "mcr.microsoft.com/dotnet/sdk:9.0", "features": { "ghcr.io/devcontainers/features/dotnet:2": { "version": "latest", - "additionalVersions": "7.0,6.0,5.0,3.1" + "additionalVersions": "8.0,7.0,6.0,5.0,3.1" } }, diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh index 34cef2fcd..0c990f19e 100644 --- a/.devcontainer/post-install.sh +++ b/.devcontainer/post-install.sh @@ -1,7 +1,7 @@ #/bin/bash # Install docfx (should be aligned with docs-deploy.yml) -dotnet tool install --global docfx --version 2.74.1 +dotnet tool restore # Trust dotnet developer certs dotnet dev-certs https --check --trust diff --git a/.editorconfig b/.editorconfig index 1ee6999e5..678b64563 100644 --- a/.editorconfig +++ b/.editorconfig @@ -453,6 +453,7 @@ dotnet_diagnostic.S112.severity = none # S112: General exceptions should never b dotnet_diagnostic.S1075.severity = suggestion # S1075: URIs should not be hardcoded dotnet_diagnostic.S1186.severity = suggestion # S1186: Methods should not be empty dotnet_diagnostic.S2292.severity = suggestion # S2292: Trivial properties should be auto-implemented +dotnet_diagnostic.S3267.severity = suggestion # S3267: Convert foreach loop to LINQ query dotnet_diagnostic.S4158.severity = none # BUGGY with C#9 code - doesnt understand local methods # Razor specific rules diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31b34874a..b103dc6aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: - name: โš™๏ธ Setup GIT versioning uses: dotnet/nbgv@v0.4.2 + id: nbgv with: setAllVars: true @@ -68,7 +69,7 @@ jobs: with: files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]' env: - RELEASE_VERSION: ${{ env.NBGV_SimpleVersion }}${{ env.NBGV_PrereleaseVersion }} + RELEASE_VERSION: ${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }} RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }} # Create the NuGet package in the folder from the environment variable NuGetDirectory @@ -136,20 +137,25 @@ jobs: 8.0.x 9.0.x + - name: โš™๏ธ Restore packages and tools + run: | + dotnet restore + dotnet tool restore + - name: ๐Ÿงช Run unit tests - run: dotnet test -c release -p:VSTestUseMSBuildOutput=false + run: dotnet test -c release --no-restore - name: ๐Ÿ“› Upload hang- and crash-dumps on test failure - if: failure() - uses: actions/upload-artifact@v3 + if: success() || failure() + uses: actions/upload-artifact@v4 with: if-no-files-found: ignore name: test-dumps path: | - **/*hangdump.dmp - **/*crashdump.dmp + **/*.dmp + **/*.dmp - validate_template: + validate-template: runs-on: ubuntu-latest needs: [ create-nuget ] steps: @@ -157,8 +163,11 @@ jobs: with: fetch-depth: 0 # Get all history to allow automatic versioning using MinVer - - name: Setup .NET + - name: โš™๏ธ Setup dotnet uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 9.0.x - uses: actions/download-artifact@v4 with: @@ -178,13 +187,23 @@ jobs: run: | dotnet new bunit --no-restore -o ${{ github.workspace }}/TemplateTestXunit echo '' >> ${{ github.workspace }}/TemplateTestXunit/Directory.Build.props + echo 'false' >> ${{ github.workspace }}/TemplateTestXunit/Directory.Packages.props dotnet restore ${{ github.workspace }}/TemplateTestXunit --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }} dotnet test ${{ github.workspace }}/TemplateTestXunit + - name: โœ” Verify xUnit.v3 template + run: | + dotnet new bunit --framework xunitv3 --no-restore -o ${{ github.workspace }}/TemplateTestXunitv3 + echo '' >> ${{ github.workspace }}/TemplateTestXunitv3/Directory.Build.props + echo 'false' >> ${{ github.workspace }}/TemplateTestXunitv3/Directory.Packages.props + dotnet restore ${{ github.workspace }}/TemplateTestXunitv3 --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }} + dotnet test ${{ github.workspace }}/TemplateTestXunitv3 + - name: โœ” Verify NUnit template run: | dotnet new bunit --framework nunit --no-restore -o ${{ github.workspace }}/TemplateTestNunit echo '' >> ${{ github.workspace }}/TemplateTestNunit/Directory.Build.props + echo 'false' >> ${{ github.workspace }}/TemplateTestNunit/Directory.Packages.props dotnet restore ${{ github.workspace }}/TemplateTestNunit --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }} dotnet test ${{ github.workspace }}/TemplateTestNunit @@ -192,6 +211,7 @@ jobs: run: | dotnet new bunit --framework mstest --no-restore -o ${{ github.workspace }}/TemplateTestMstest echo '' >> ${{ github.workspace }}/TemplateTestMstest/Directory.Build.props + echo 'false' >> ${{ github.workspace }}/TemplateTestMstest/Directory.Packages.props dotnet restore ${{ github.workspace }}/TemplateTestMstest --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }} dotnet test ${{ github.workspace }}/TemplateTestMstest @@ -216,15 +236,23 @@ jobs: - name: โš™๏ธ Setup GIT versioning uses: dotnet/nbgv@v0.4.2 + id: nbgv with: setAllVars: true + - name: ๐Ÿ› ๏ธ Get Changelog Entry + id: changelog_reader + uses: mindsers/changelog-reader-action@v2 + with: + version: Unreleased + path: ./CHANGELOG.md + - name: ๐Ÿฅ Replace tokens in files uses: cschleiden/replace-tokens@v1 with: files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props", "docs/site/docfx.json"]' env: - RELEASE_VERSION: ${{ env.NBGV_SimpleVersion }}${{ env.NBGV_PrereleaseVersion }} + RELEASE_VERSION: ${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }} RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }} - name: ๐Ÿ“„ Build bUnit @@ -254,7 +282,7 @@ jobs: release-preview: if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/v2') runs-on: ubuntu-latest - needs: [ validate-nuget, run-test, validate_template, validate-docs ] + needs: [ validate-nuget, run-test, validate-template, validate-docs ] steps: - uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index e8ebf51f1..93cdde359 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -51,6 +51,7 @@ jobs: - name: โš™๏ธ Setup GIT versioning uses: dotnet/nbgv@v0.4.2 + id: nbgv with: setAllVars: true @@ -60,10 +61,10 @@ jobs: with: path: ./CHANGELOG.md - - name: ๐Ÿ› ๏ธ Update tokens in project files + - name: ๐Ÿ› ๏ธ Update tokens in files uses: cschleiden/replace-tokens@v1 with: - files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]' + files: '["docs/site/*.md", "docs/**/*.md", "docs/**/docfx.json", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]' env: RELEASE_VERSION: ${{ steps.changelog_reader.outputs.version }} RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }} @@ -123,9 +124,8 @@ jobs: - name: โญ Create pull request from stable to main when direct merge fails if: steps.mergeMainline.outcome == 'failure' uses: thomaseizinger/create-pull-request@1.4.0 - env: - GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }} with: + github_token: ${{ secrets.BUNIT_BOT_TOKEN }} head: stable base: main title: Update main with documentation in stable diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 37c77fc79..5b48c8c0f 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -28,6 +28,12 @@ jobs: version: Unreleased path: ./CHANGELOG.md + - name: โš™๏ธ Setup GIT versioning + uses: dotnet/nbgv@v0.4.2 + id: nbgv + with: + setAllVars: true + - name: โ˜‘ Check that release contains changes if: steps.changelog_reader.outputs.changes == '' run: | @@ -85,12 +91,11 @@ jobs: - name: โญ Create pull request for release branch uses: thomaseizinger/create-pull-request@1.4.0 - env: - GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }} with: - head: release/v${{ env.NBGV_MajorMinorVersion }} + github_token: ${{ secrets.BUNIT_BOT_TOKEN }} + head: release/v${{ steps.nbgv.outputs.MajorMinorVersion }} base: stable - title: Release of new ${{ github.event.inputs.versionIncrement }} version v${{ env.NBGV_MajorMinorVersion }} + title: Release of new ${{ github.event.inputs.versionIncrement }} version v${{ steps.nbgv.outputs.MajorMinorVersion }} body: | This PR was created in response to a manual trigger of the [prepare-release workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}). diff --git a/.github/workflows/rebase-v2-on-main.yml b/.github/workflows/rebase-v2-on-main.yml index 11178ce44..2786b4db7 100644 --- a/.github/workflows/rebase-v2-on-main.yml +++ b/.github/workflows/rebase-v2-on-main.yml @@ -48,9 +48,8 @@ jobs: - name: โญ Create pull request if: steps.rebaseV2.outcome == 'failure' uses: thomaseizinger/create-pull-request@1.4.0 - env: - GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }} with: + github_token: ${{ secrets.BUNIT_BOT_TOKEN }} head: main base: v2 title: Rebase v2 on main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9172732d0..9447b5192 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,7 @@ jobs: - name: โš™๏ธ Setup GIT versioning uses: dotnet/nbgv@v0.4.2 + id: nbgv with: setAllVars: true @@ -65,9 +66,9 @@ jobs: 9.0.x - name: ๐Ÿ› ๏ธ Update changelog - uses: thomaseizinger/keep-a-changelog-new-release@3.0.0 + uses: thomaseizinger/keep-a-changelog-new-release@3.1.0 with: - version: ${{ env.NBGV_SemVer2 }} + version: ${{ steps.nbgv.outputs.SemVer2 }} - name: ๐Ÿ› ๏ธ Update changelog compare URLs shell: bash @@ -78,14 +79,14 @@ jobs: - name: ๐Ÿ› ๏ธ Commit CHANGELOG.md to stable branch run: | git add CHANGELOG.md - git commit -S -m "Updated CHANGELOG.md for ${{ env.NBGV_SimpleVersion }} release" + git commit -S -m "Updated CHANGELOG.md for ${{ steps.nbgv.outputs.SimpleVersion }} release" echo "RELEASE_COMMIT_HASH=$(git rev-parse stable)" >> $GITHUB_ENV - name: ๐Ÿ› ๏ธ Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2 with: - version: ${{ env.NBGV_SemVer2 }} + version: ${{ steps.nbgv.outputs.SemVer2 }} path: ./CHANGELOG.md - name: ๐Ÿ› ๏ธ Update tokens in project files @@ -93,7 +94,7 @@ jobs: with: files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]' env: - RELEASE_VERSION: ${{ env.NBGV_NuGetPackageVersion }} + RELEASE_VERSION: ${{ steps.nbgv.outputs.NuGetPackageVersion }} RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }} - name: ๐Ÿ› ๏ธ Packing library in release mode @@ -101,7 +102,8 @@ jobs: dotnet pack src/bunit/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true dotnet pack src/bunit.core/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true dotnet pack src/bunit.web/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true - dotnet pack src/bunit.template/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true + dotnet pack src/bunit.generators/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true + dotnet pack src/bunit.web.query/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true - name: ๐Ÿ› ๏ธ Upload library to NuGet.org repository run: | @@ -111,16 +113,15 @@ jobs: run: git push origin stable - name: ๐Ÿ› ๏ธ Create GitHub release - uses: thomaseizinger/create-release@1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: thomaseizinger/create-release@2.0.0 with: - tag_name: v${{ env.NBGV_SemVer2 }} + tag_name: v${{ steps.nbgv.outputs.SemVer2 }} target_commitish: ${{ env.RELEASE_COMMIT_HASH }} - name: ${{ env.NBGV_SemVer2 }} + name: ${{ steps.nbgv.outputs.SemVer2 }} body: ${{ steps.changelog_reader.outputs.changes }} draft: false - prerelease: ${{ env.NBGV_PublicRelease == 'False' }} + prerelease: ${{ steps.nbgv.outputs.PublicRelease == 'False' }} + github_token: ${{ secrets.GITHUB_TOKEN }} - name: โฉ Merge stable with main, push to origin id: mergeMainline @@ -133,12 +134,11 @@ jobs: - name: โญ Create pull request from stable to main when direct merge fails if: steps.mergeMainline.outcome == 'failure' uses: thomaseizinger/create-pull-request@1.4.0 - env: - GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }} with: + github_token: ${{ secrets.BUNIT_BOT_TOKEN }} head: stable base: main - title: Update main with changes in stable after v${{ env.NBGV_SemVer2 }} release + title: Update main with changes in stable after v${{ steps.nbgv.outputs.SemVer2 }} release reviewers: ${{ github.actor }} # By default, we request a review from the person who triggered the workflow. body: | Hi @${{ github.actor }} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9aebda5c8..458ec69a3 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,12 +6,12 @@ { "label": "Serve Docs (Without Build)", "type": "shell", - "command": "docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve" + "command": "dotnet docfx metadata docs/site/docfx.json && dotnet docfx docs/site/docfx.json --serve" }, { "label": "Serve Docs (With Build for API Documentation)", "type": "shell", - "command": "dotnet build -c Release && docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve" + "command": "dotnet build -c Release && dotnet docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve" }, { "label": "Run all tests (Release Mode)", diff --git a/CHANGELOG.md b/CHANGELOG.md index 781da071e..c1991bd23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,63 @@ All notable changes to **bUnit** will be documented in this file. The project ad ## [Unreleased] +### Fixed + +- Do not set the `Uri` or `BaseUri` property on the `FakeNavigationManager` if navigation is prevented by a handler on `net7.0` or greater. Reported and fixed by [@ayyron-dev](https://github.com/ayyron-dev) in [#1647](https://github.com/bUnit-dev/bUnit/issues/1647) + +## [1.38.5] - 2025-01-12 + +### Added + +- Added support for xunit v3 in the bunit.template. By [@linkdotnet](https://github.com/linkdotnet). + +## [1.37.7] - 2024-12-13 + +### Added + +- Added support for `RendererInfo` and `AssignedRenderMode` (`.net9.0`). + +## [1.36.0] - 2024-11-12 + +### Added + +- Bumped .NET 9 version dependencies to stable packages. + +## [1.35.3] - 2024-11-12 + +### Added + +- Extension packages (`bunit.generators` and `bunit.web.query`) are flagged as stable. + +## [1.34.0] - 2024-11-01 + +### Fixed + +- Fixed other packages that have a CVE like `Microsoft.Extensions.Caching.Memory`. Reported by [@polajenko](https://github.com/polajenko). Fixed by [@linkdotnet](https://github.com/linkdotnet). + +## [1.33.3] - 2024-10-11 + +### Added + +- `bunit.generators` respect parameters from the base class. +- Supports components using constructor injection in `net9.0`. + +### Fixed + +- Use latest `System.Text.Json` due to CVE in `8.0.4`. + +## [1.32.7] - 2024-10-04 + +### Fixed + +- Ensure that a check in `WaitForAssertion` and related methods is always performed at once before the wait timer is started. If not, the timeout could occure before a wait-for check-condition had been attempted, causing tests to fail without reason. Fixed by [@egil](https://github.com/egil). + +## [1.31.3] - 2024-08-16 + +### Fixed + +- `UploadFile` should only throw an exception when the file size exceeds the maximum allowed size. Reported by [@candritzky](https://github.com/candritzky). Fixed by [@linkdotnet](https://github.com/linkdotnet). + ## [1.30.3] - 2024-07-21 ### Fixed @@ -1382,7 +1439,15 @@ The latest version of the library is availble on NuGet: - **Wrong casing on keyboard event dispatch helpers.** The helper methods for the keyboard events was not probably cased, so that has been updated. E.g. from `Keypress(...)` to `KeyPress(...)`. -[unreleased]: https://github.com/bUnit-dev/bUnit/compare/v1.30.3...HEAD +[unreleased]: https://github.com/bUnit-dev/bUnit/compare/v1.38.5...HEAD +[1.38.5]: https://github.com/bUnit-dev/bUnit/compare/v1.37.7...v1.38.5 +[1.37.7]: https://github.com/bUnit-dev/bUnit/compare/v1.36.0...1.37.7 +[1.36.0]: https://github.com/bUnit-dev/bUnit/compare/v1.35.3...v1.36.0 +[1.35.3]: https://github.com/bUnit-dev/bUnit/compare/v1.34.0...1.35.3 +[1.34.0]: https://github.com/bUnit-dev/bUnit/compare/v1.33.3...v1.34.0 +[1.33.3]: https://github.com/bUnit-dev/bUnit/compare/v1.32.7...1.33.3 +[1.32.7]: https://github.com/bUnit-dev/bUnit/compare/v1.31.3...v1.32.7 +[1.31.3]: https://github.com/bUnit-dev/bUnit/compare/v1.30.3...1.31.3 [1.30.3]: https://github.com/bUnit-dev/bUnit/compare/v1.29.5...v1.30.3 [1.29.5]: https://github.com/bUnit-dev/bUnit/compare/v1.28.9...1.29.5 [1.28.9]: https://github.com/bUnit-dev/bUnit/compare/v1.27.17...v1.28.9 diff --git a/Directory.Build.props b/Directory.Build.props index d9a96bfbf..b2194a03c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,15 +1,6 @@ - - 3.1.* - 5.0.* - 6.0.* - 7.0.* - 8.0.* - 9.0.0-* - - Egil Hansen @@ -25,6 +16,7 @@ enable CA1014,NU5104,NETSDK1138,SYSLIB0051 false + true full @@ -49,14 +41,7 @@ true - - - - - - - + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..7c79b36a3 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,149 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 000000000..c5e21601d --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,7 @@ +๏ปฟ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index a1f0bb490..691daaa00 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,6 @@ # bUnit - a testing library for Blazor components - - - - - - - **bUnit** is a testing library for Blazor Components. Its goal is to make it easy to write _comprehensive, stable_ unit tests. With bUnit, you can: - Setup and define components under tests using C# or Razor syntax @@ -40,17 +33,10 @@ To get started, head to the [getting started documentation](https://bunit.dev/do ## Sponsors -A huge thank you to the [sponsors of my work with bUnit](https://github.com/sponsors/egil). The higher tier sponsors are: +A huge thank you to the [sponsors of bUnit](https://github.com/sponsors/egil). The higher tier sponsors are: - diff --git a/benchmark/Directory.Build.props b/benchmark/Directory.Build.props index 62cb9cc94..27b0bf9c3 100644 --- a/benchmark/Directory.Build.props +++ b/benchmark/Directory.Build.props @@ -1,9 +1,6 @@ - enable - 10.0 - enable CA1014,NU5104 false diff --git a/benchmark/bunit.benchmarks/bunit.benchmarks.csproj b/benchmark/bunit.benchmarks/bunit.benchmarks.csproj index ffeb33523..15a876547 100644 --- a/benchmark/bunit.benchmarks/bunit.benchmarks.csproj +++ b/benchmark/bunit.benchmarks/bunit.benchmarks.csproj @@ -8,7 +8,7 @@ - + diff --git a/bunit.sln b/bunit.sln index 4ce0606e1..07a425cf2 100644 --- a/bunit.sln +++ b/bunit.sln @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{A5D7B6 .gitattributes = .gitattributes .gitignore = .gitignore Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props .config\dotnet-tools.json = .config\dotnet-tools.json global.json = global.json version.json = version.json @@ -25,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6EA09ED4 tests\.editorconfig = tests\.editorconfig tests\Directory.Build.props = tests\Directory.Build.props tests\run-tests.ps1 = tests\run-tests.ps1 + tests\xunit.runner.json = tests\xunit.runner.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".text", ".text", "{392FCD4E-356A-412A-A854-8EE197EA65B9}" @@ -56,15 +58,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".workflows", ".workflows", .github\workflows\release.yml = .github\workflows\release.yml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmark", "benchmark", "{F6084D31-2A92-4794-A47E-A8F2254E6970}" - ProjectSection(SolutionItems) = preProject - benchmark\Directory.Build.props = benchmark\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.benchmarks", "benchmark\bunit.benchmarks\bunit.benchmarks.csproj", "{9F7A0623-8294-4A5D-946F-70C481732AA5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.benchmarks.assets", "benchmark\bunit.benchmarks.assets\bunit.benchmarks.assets.csproj", "{3619481F-DF6F-4399-9FED-450EE545A19E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query", "src\bunit.web.query\bunit.web.query.csproj", "{0FF92169-7D8F-46A2-8327-A2F028CB426F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query.tests", "tests\bunit.web.query.tests\bunit.web.query.tests.csproj", "{DE975A0C-0672-4248-913E-D267C1001801}" @@ -105,14 +98,6 @@ Global {7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|Any CPU.Build.0 = Debug|Any CPU {7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|Any CPU.ActiveCfg = Release|Any CPU {7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|Any CPU.Build.0 = Release|Any CPU - {9F7A0623-8294-4A5D-946F-70C481732AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F7A0623-8294-4A5D-946F-70C481732AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F7A0623-8294-4A5D-946F-70C481732AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F7A0623-8294-4A5D-946F-70C481732AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {3619481F-DF6F-4399-9FED-450EE545A19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3619481F-DF6F-4399-9FED-450EE545A19E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3619481F-DF6F-4399-9FED-450EE545A19E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3619481F-DF6F-4399-9FED-450EE545A19E}.Release|Any CPU.Build.0 = Release|Any CPU {0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.Build.0 = Debug|Any CPU {0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -145,8 +130,6 @@ Global {6127D121-9387-451B-B15D-8350A32D3001} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59} {FC122F63-8B22-4BAE-B96A-7AF3194CD204} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520} {7972A80F-30DC-4EF4-9294-7D4DD2965882} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520} - {9F7A0623-8294-4A5D-946F-70C481732AA5} = {F6084D31-2A92-4794-A47E-A8F2254E6970} - {3619481F-DF6F-4399-9FED-450EE545A19E} = {F6084D31-2A92-4794-A47E-A8F2254E6970} {0FF92169-7D8F-46A2-8327-A2F028CB426F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59} {DE975A0C-0672-4248-913E-D267C1001801} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520} {AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59} diff --git a/docs/samples/components/bunit.docs.samples.csproj b/docs/samples/components/bunit.docs.samples.csproj index aa97c0fe7..5bc4c1ae9 100644 --- a/docs/samples/components/bunit.docs.samples.csproj +++ b/docs/samples/components/bunit.docs.samples.csproj @@ -1,61 +1,19 @@ - netstandard2.0;net5.0;net6.0;net7.0;net8.0;net9.0 + net8.0 latest - 3.0 Bunit.Docs.Samples enable CA1014,NU5104 false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - diff --git a/docs/samples/myfile.json b/docs/samples/myfile.json new file mode 100644 index 000000000..72ec0a029 --- /dev/null +++ b/docs/samples/myfile.json @@ -0,0 +1,20 @@ +'packages' was not matched. Did you mean one of the following? +package + +Description: + List references or packages of a .NET project. + +Usage: + dotnet list [] [command] [options] + +Arguments: + The project or solution file to operate on. If a file is not specified, the command will search the current + directory for one. [default: /Users/stevengiesel/repos/bUnit/docs/samples/] + +Options: + -?, -h, --help Show command line help. + +Commands: + package List all package references of the project or solution. + reference List all project-to-project references of the project. + diff --git a/docs/samples/samples.sln b/docs/samples/samples.sln index 153a2c535..ed724da75 100644 --- a/docs/samples/samples.sln +++ b/docs/samples/samples.sln @@ -18,6 +18,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.xunit.samples", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.razor.samples", "tests\razor\bunit.docs.razor.samples.csproj", "{C92CB47E-8A70-409C-9213-8D743BB29366}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7066A15B-F4AC-43FE-97FF-80B321F29A06}" + ProjectSection(SolutionItems) = preProject + ..\..\Directory.Packages.props = ..\..\Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/docs/samples/tests/Directory.Build.props b/docs/samples/tests/Directory.Build.props index e5b3bbe6b..b79778dbc 100644 --- a/docs/samples/tests/Directory.Build.props +++ b/docs/samples/tests/Directory.Build.props @@ -1,27 +1,14 @@ - netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0 + net8.0 false true false true latest - 3.0 enable - CA1014,NU5104 + CA1014,NU5104,xUnit1031 false - - - - - - - - - - - - diff --git a/docs/samples/tests/mstest/bunit.docs.mstest.samples.csproj b/docs/samples/tests/mstest/bunit.docs.mstest.samples.csproj index 2d6428b0b..3dc4399a2 100644 --- a/docs/samples/tests/mstest/bunit.docs.mstest.samples.csproj +++ b/docs/samples/tests/mstest/bunit.docs.mstest.samples.csproj @@ -5,12 +5,15 @@ - - - - - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/docs/samples/tests/nunit/bunit.docs.nunit.samples.csproj b/docs/samples/tests/nunit/bunit.docs.nunit.samples.csproj index a51a9ff84..f0b0211a4 100644 --- a/docs/samples/tests/nunit/bunit.docs.nunit.samples.csproj +++ b/docs/samples/tests/nunit/bunit.docs.nunit.samples.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/docs/samples/tests/razor/bunit.docs.razor.samples.csproj b/docs/samples/tests/razor/bunit.docs.razor.samples.csproj index 9dff4b342..50e257101 100644 --- a/docs/samples/tests/razor/bunit.docs.razor.samples.csproj +++ b/docs/samples/tests/razor/bunit.docs.razor.samples.csproj @@ -5,13 +5,12 @@ - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers NU1701 diff --git a/docs/samples/tests/xunit/ComponentFactoryExampleTest.cs b/docs/samples/tests/xunit/ComponentFactoryExampleTest.cs index 580ab4096..b811e54a3 100644 --- a/docs/samples/tests/xunit/ComponentFactoryExampleTest.cs +++ b/docs/samples/tests/xunit/ComponentFactoryExampleTest.cs @@ -21,7 +21,7 @@ public void ReplacesFooWithBarDuringTest() // Assert that there are no in render tree, // but there is one in the render tree. Assert.Empty(cut.FindComponents()); - Assert.Equal(1, cut.FindComponents().Count); + Assert.Single(cut.FindComponents()); } } } diff --git a/docs/samples/tests/xunit/bunit.docs.xunit.samples.csproj b/docs/samples/tests/xunit/bunit.docs.xunit.samples.csproj index 96ed4edf4..ebb9e06e2 100644 --- a/docs/samples/tests/xunit/bunit.docs.xunit.samples.csproj +++ b/docs/samples/tests/xunit/bunit.docs.xunit.samples.csproj @@ -5,19 +5,18 @@ - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - NU1701 - + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + NU1701 + diff --git a/docs/site/docs/interaction/index.md b/docs/site/docs/interaction/index.md index 96e06fdde..9967c90ea 100644 --- a/docs/site/docs/interaction/index.md +++ b/docs/site/docs/interaction/index.md @@ -11,3 +11,4 @@ This section covers the various ways to interact with a component under test, e. - **:** This covers how to manually trigger a render cycle for a component under test. - **:** This covers how to await one or more asynchronous changes to the state of a component under test before continuing the test. - **:** This covers how to dispose components and their children. +- **:** This covers the different render modes and their interaction with bUnit. diff --git a/docs/site/docs/interaction/render-modes.md b/docs/site/docs/interaction/render-modes.md new file mode 100644 index 000000000..fc40eee6d --- /dev/null +++ b/docs/site/docs/interaction/render-modes.md @@ -0,0 +1,157 @@ +--- +uid: render-modes +title: Render modes and RendererInfo +--- + +# Support for render modes and `RendererInfo` +This article explains how to emulate different render modes and `RendererInfo` in bUnit tests. + +Render modes in Blazor Web Apps determine the hosting model and interactivity of components. A render mode can be applied to a component using the `@rendermode` directive. The [`RendererInfo`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.rendererinfo?view=aspnetcore-9.0) allows the application to determine the interactivity and location of the component. For more details, see the [Blazor render modes](https://learn.microsoft.com/en-us/aspnet/core/blazor/components/render-modes?view=aspnetcore-9.0) documentation. + +## Setting the render mode for a component under test +Setting the render mode can be done via the method when writing in a C# file. In a razor file use the `@rendermode` directive. Both take an [`IComponentRenderMode`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.icomponentrendermode?view=aspnetcore-9.0) object as a parameter. Normally this is one of the following types: + * [`InteractiveAutoRenderMode`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.web.interactiveautorendermode?view=aspnetcore-9.0) + * [`InteractiveServerRendeMode`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.web.interactiveserverrendermode?view=aspnetcore-9.0) + * [`InteractiveWebAssemblyRenderMode`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.web.interactivewebassemblyrendermode?view=aspnetcore-9.0) + +For ease of use the [`RenderMode`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.web.rendermode?view=aspnetcore-9.0) class defines all three of them. + +For example `MovieComponent.razor`: +```razor +@if (AssignedRenderMode is null) +{ + // The render mode is Static Server +
+ + + +} +else +{ + // The render mode is Interactive Server, WebAssembly, or Auto + + +} +``` + +The following example shows how to test the above component to check both render modes: + +# [C# test code](#tab/csharp) + +```csharp +[Fact] +public void InteractiveServer() +{ + // Act + var cut = RenderComponent(ps => ps + .SetAssignedRenderMode(RenderMode.InteractiveServer)); + + // Assert + cut.MarkupMatches(""" + + + """); +} + +[Fact] +public void StaticRendering() +{ + // Act + var cut = RenderComponent(); + // This is the same behavior as: + // var cut = RenderComponent(ps => ps + // .SetAssignedRenderMode(null)); + + // Assert + cut.MarkupMatches(""" +
+ + + + """); +} +``` + +# [Razor test code](#tab/razor) + +```razor +@inherits TestContext +@code { + [Fact] + public void InteractiveServer() + { + // Act + var cut = Render(@); + + // Assert + cut.MarkupMatches(@ + + + ); + } + + [Fact] + public void StaticRendering() + { + // Act + var cut = Render(@); + + // Assert + cut.MarkupMatches(@
+ + + ); + } +} +``` + +*** + +## Setting the `RendererInfo` during testing +To control the `ComponentBase.RendererInfo` property during testing, use the method on the `TestContext` class. The `SetRendererInfo` method takes an nullable `RendererInfo` object as a parameter. Passing `null` will set the `ComponentBase.RendererInfo` to `null`. + +A component (`AssistentComponent.razor`) might check if interactivity is given to enable a button: + +```razor +@if (RendererInfo.IsInteractive) +{ +

Hey I am your assistant

+} +else +{ +

Loading...

+} +``` + +In the test, you can set the `RendererInfo` to enable or disable the button: + +```csharp +[Fact] +public void SimulatingPreRenderingOnBlazorServer() +{ + // Arrange + SetRendererInfo(new RendererInfo(rendererName: "Static", isInteractive: false)); + + // Act + var cut = RenderComponent(); + + // Assert + cut.MarkupMatches("

Loading...

"); +} + +[Fact] +public void SimulatingInteractiveServerRendering() +{ + // Arrange + SetRendererInfo(new RendererInfo(rendererMode: "Server", isInteractive: true)); + + // Act + var cut = RenderComponent(); + + // Assert + cut.MarkupMatches("

Hey I am your assistant

"); +} +``` + +> [!NOTE] +> If a component under test uses the `ComponentBase.RendererInfo` property and the `SetRendererInfo` on `TestContext` hasn't been passed in a `RendererInfo` object, the renderer will throw an exception. \ No newline at end of file diff --git a/docs/site/docs/providing-input/passing-parameters-to-components.md b/docs/site/docs/providing-input/passing-parameters-to-components.md index 4db2fccf1..a69b91875 100644 --- a/docs/site/docs/providing-input/passing-parameters-to-components.md +++ b/docs/site/docs/providing-input/passing-parameters-to-components.md @@ -466,7 +466,8 @@ When rendering a `RenderFragment` using the 's `Add` method, if a component parameter is only annotated with the `[SupplyParameterFromQuery]` attribute. Instead, pass a query string parameters by setting it using the . diff --git a/docs/site/docs/test-doubles/faking-persistentcomponentstate.md b/docs/site/docs/test-doubles/faking-persistentcomponentstate.md index c03f78110..9e28aa42c 100644 --- a/docs/site/docs/test-doubles/faking-persistentcomponentstate.md +++ b/docs/site/docs/test-doubles/faking-persistentcomponentstate.md @@ -12,7 +12,7 @@ bUnit comes with fake version of the `PersistentComponentState` type in Blazor t To use the fake `PersistentComponentState` in bUnit, call the `AddFakePersistentComponentState` extension method on `TestContext`: ```csharp -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); ``` Calling `AddFakePersistentComponentState` returns a `FakePersistentComponentState` type, which has three methods; one to persist data, one to get persisted data, and one that triggers any "OnPersisting" callbacks added to the `PersistentComponentState`. @@ -20,7 +20,7 @@ Calling `AddFakePersistentComponentState` returns a `FakePersistentComponentStat To add data to the `PersistentComponentState` before running a test, i.e. to verify that a component uses the persisted state, use the `Persist` method: ```csharp -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); var key = "STATE KEY"; var data = ...; // data to persist @@ -31,7 +31,7 @@ fakeState.Persist(key, data); To trigger a callback registered with the `PersistentComponentState.RegisterOnPersisting` method, use the `TriggerOnPersisting` method on `FakePersistentComponentState`: ```csharp -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); // render component @@ -41,7 +41,7 @@ fakeState.TriggerOnPersisting(); To check if data has been persisted, use the `TryTake` method: ```csharp -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); var key = "STATE KEY"; // render component, call TriggerOnPersisting @@ -95,7 +95,7 @@ To test that the `` component uses persisted weather data instead of ```csharp // Arrange -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); // Persist a single weather forecast with a temperature of 42 fakeState.Persist("weather-data", new [] { new WeatherForecast { Temperature = 42 } }); @@ -111,7 +111,7 @@ To test that the `` component correctly persists weather data when it ```csharp // Arrange -var fakeState = AddFakePersistentComponentState(); +var fakeState = this.AddFakePersistentComponentState(); var cut = RenderComponent(); // Act - trigger the FetchData components PersistForecasts method diff --git a/docs/site/docs/test-doubles/input-file.md b/docs/site/docs/test-doubles/input-file.md index bae083b5d..c34442d0f 100644 --- a/docs/site/docs/test-doubles/input-file.md +++ b/docs/site/docs/test-doubles/input-file.md @@ -25,4 +25,45 @@ inputFile.UploadFile(fileToUpload); // Assertions... ``` -To upload binary content, create an `InputFileContent` with the `InputFileContent.CreateFromBinary()` method. \ No newline at end of file +To upload binary content, create an `InputFileContent` with the `InputFileContent.CreateFromBinary()` method. + +## Known limitations +bUnit's support for the `InputFile` component is limited when uploading and resizing images (using the provided stream). + +```razor + + + +@code { + private string imageBase64 = string.Empty; + + private async Task Upload(InputFileChangeEventArgs args) + { + var file = args.File; + var preview = await file.RequestImageFileAsync("image/png", 100, 100); + await using var stream = preview.OpenReadStream(); + var buffer = new byte[stream.Length]; + await using var memoryStream = new MemoryStream(buffer); + await stream.CopyToAsync(memoryStream); + var base64 = Convert.ToBase64String(buffer); + imageBase64 = $"data:image/png;base64,{base64}"; + } +} +``` + +When using the `RequestImageFileAsync` method, the `UploadFiles` method will not be able to upload the file inside a test. Blazor has some internal checks, bUnit can not overcome easily. So the following test will fail: + +```csharp +[Fact] +public void UploadFileTest() +{ + var cut = Render(); + + cut.FindComponent().UploadFiles(InputFileContent.CreateFromBinary([1,2], "test.png")); + + cut.Find("img").GetAttribute("src").Should().NotBeNullOrEmpty(); // Will fail + Renderer.UnhandledException.Should().BeNull(); // Will fail +} +``` + +To work around this limitation, refactoring the logic into a service that is injected into the component and then mocking the service in the test is a possible solution. \ No newline at end of file diff --git a/docs/site/docs/toc.md b/docs/site/docs/toc.md index 327afde06..8d937b05c 100644 --- a/docs/site/docs/toc.md +++ b/docs/site/docs/toc.md @@ -14,6 +14,7 @@ ## [Trigger renders](xref:trigger-renders) ## [Awaiting an async state change](xref:awaiting-async-state) ## [Disposing components](xref:dispose-components) +## [Render modes and RendererInfo](xref:render-modes) # [Verifying output](xref:verification) ## [Verify markup](xref:verify-markup) diff --git a/docs/site/index.md b/docs/site/index.md index a5a62bfe9..9d0242daa 100644 --- a/docs/site/index.md +++ b/docs/site/index.md @@ -50,24 +50,14 @@ bUnit is available on NuGet in various incarnations. Most users should just pick ## Sponsors -A huge thank you to the [sponsors of my work with bUnit](https://github.com/sponsors/egil). The higher tier sponsors are: +A huge thank you to the [sponsors of bUnit](https://github.com/sponsors/egil). The higher tier sponsors are:
- - @Progress-Telerik -
- Progress Telerik - @syncfusion
Syncfusion - - @aws -
- Amazon Web Services -
## Contributors diff --git a/docs/site/templates/bunit/layout/_master.tmpl b/docs/site/templates/bunit/layout/_master.tmpl index 8446a5ad0..c046a765d 100644 --- a/docs/site/templates/bunit/layout/_master.tmpl +++ b/docs/site/templates/bunit/layout/_master.tmpl @@ -138,18 +138,6 @@
-
- - Progress Telerik - -

Premium sponsor: Progress Telerik.

-
-
- - Packt - -

Editorial support provided by Packt.

-
.NET Foundation diff --git a/global.json b/global.json index 83105ca8e..18562b58c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "rollForward": "latestMajor", - "allowPrerelease": true + "allowPrerelease": false } } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 991738e81..89a13faaa 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -21,7 +21,9 @@ embedded true + + true true 1.25.3 @@ -51,10 +53,6 @@ See the full changelog at https://github.com/bUnit-dev/bUnit/releases - - True - \ - True \ @@ -62,8 +60,10 @@ See the full changelog at https://github.com/bUnit-dev/bUnit/releases - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/bunit.core/Asserting/ActualExpectedAssertException.cs b/src/bunit.core/Asserting/ActualExpectedAssertException.cs index 4a75fdc18..498d302eb 100644 --- a/src/bunit.core/Asserting/ActualExpectedAssertException.cs +++ b/src/bunit.core/Asserting/ActualExpectedAssertException.cs @@ -1,10 +1,12 @@ +using Bunit.Internal.XUnitExceptions; + namespace Bunit.Asserting; /// /// Represents a generic assert exception used when an actual result does not match an expected result. /// [Serializable] -public class ActualExpectedAssertException : Exception +public class ActualExpectedAssertException : Exception, IAssertionException { /// /// Initializes a new instance of the class. diff --git a/src/bunit.core/ComponentParameterCollection.cs b/src/bunit.core/ComponentParameterCollection.cs index 7b248b096..9f179bc94 100644 --- a/src/bunit.core/ComponentParameterCollection.cs +++ b/src/bunit.core/ComponentParameterCollection.cs @@ -19,6 +19,14 @@ public class ComponentParameterCollection : ICollection, IRe /// public bool IsReadOnly { get; } +#if NET9_0_OR_GREATER + /// + /// Gets or sets the that will be specified in + /// the render tree for component the parameters are being passed to. + /// + public IComponentRenderMode? RenderMode { get; set; } +#endif + /// /// Adds a to the collection. /// @@ -104,6 +112,9 @@ void AddComponent(RenderTreeBuilder builder) { builder.OpenComponent(0); AddAttributes(builder); +#if NET9_0_OR_GREATER + builder.AddComponentRenderMode(RenderMode); +#endif builder.CloseComponent(); } diff --git a/src/bunit.core/ComponentParameterCollectionBuilder.cs b/src/bunit.core/ComponentParameterCollectionBuilder.cs index f4c1fa04e..492b035a5 100644 --- a/src/bunit.core/ComponentParameterCollectionBuilder.cs +++ b/src/bunit.core/ComponentParameterCollectionBuilder.cs @@ -78,7 +78,7 @@ public ComponentParameterCollectionBuilder Add(Expr /// A lambda function that selects the parameter. /// The markup string to pass to the . /// This . - public ComponentParameterCollectionBuilder Add(Expression> parameterSelector, [StringSyntax("Html")]string markup) + public ComponentParameterCollectionBuilder Add(Expression> parameterSelector, [StringSyntax("Html")] string markup) => Add(parameterSelector, markup.ToMarkupRenderFragment()); /// @@ -266,7 +266,7 @@ public ComponentParameterCollectionBuilder AddChildContent(RenderFra /// /// The markup string to pass the ChildContent parameter wrapped in a . /// This . - public ComponentParameterCollectionBuilder AddChildContent([StringSyntax("Html")]string markup) + public ComponentParameterCollectionBuilder AddChildContent([StringSyntax("Html")] string markup) => AddChildContent(markup.ToMarkupRenderFragment()); /// @@ -344,11 +344,11 @@ public ComponentParameterCollectionBuilder Bind( Action changedAction, Expression>? valueExpression = null) { - #if !NET8_0_OR_GREATER +#if !NET8_0_OR_GREATER var (parameterName, _, isCascading) = GetParameterInfo(parameterSelector); - #else +#else var (parameterName, _, isCascading) = GetParameterInfo(parameterSelector, initialValue); - #endif +#endif if (isCascading) throw new ArgumentException("Using Bind with a cascading parameter is not allowed.", parameterName); @@ -397,6 +397,19 @@ static string TrimEnd(string source, string value) : source; } +#if NET9_0_OR_GREATER + /// + /// Sets (or unsets) the for the component and child components. + /// + /// The render mode to assign to the component, e.g. RenderMode.InteractiveServer, or , to not assign a specific render mode. + /// This . + public ComponentParameterCollectionBuilder SetAssignedRenderMode(IComponentRenderMode? renderMode) + { + parameters.RenderMode = renderMode; + return this; + } +#endif + /// /// Try to add a for a parameter with the , if /// has a property with that name, AND that property has a @@ -454,14 +467,14 @@ Expression> parameterSelector : propInfoCandidate; var paramAttr = propertyInfo?.GetCustomAttribute(inherit: true); - #if !NET8_0_OR_GREATER +#if !NET8_0_OR_GREATER var cascadingParamAttr = propertyInfo?.GetCustomAttribute(inherit: true); if (propertyInfo is null || (paramAttr is null && cascadingParamAttr is null)) throw new ArgumentException($"The parameter selector '{parameterSelector}' does not resolve to a public property on the component '{typeof(TComponent)}' with a [Parameter] or [CascadingParameter] attribute.", nameof(parameterSelector)); return (propertyInfo.Name, CascadingValueName: cascadingParamAttr?.Name, IsCascading: cascadingParamAttr is not null); - #else +#else var cascadingParamAttrBase = propertyInfo?.GetCustomAttribute(inherit: true); if (propertyInfo is null || (paramAttr is null && cascadingParamAttrBase is null)) @@ -494,7 +507,7 @@ static ArgumentException CreateErrorMessageForSupplyFromQuery( NavigationManager.NavigateTo(uri); """); } - #endif +#endif } private static bool HasChildContentParameter() diff --git a/src/bunit.core/Extensions/WaitForHelpers/WaitForFailedException.cs b/src/bunit.core/Extensions/WaitForHelpers/WaitForFailedException.cs index a2e8ae560..d84d68cb9 100644 --- a/src/bunit.core/Extensions/WaitForHelpers/WaitForFailedException.cs +++ b/src/bunit.core/Extensions/WaitForHelpers/WaitForFailedException.cs @@ -1,10 +1,12 @@ +using Bunit.Internal.XUnitExceptions; + namespace Bunit.Extensions.WaitForHelpers; /// /// Represents an exception thrown when the does not complete successfully. /// [Serializable] -public sealed class WaitForFailedException : Exception +public sealed class WaitForFailedException : Exception, ITestTimeoutException { /// /// Initializes a new instance of the class. @@ -15,8 +17,34 @@ public WaitForFailedException(string? errorMessage, Exception? innerException = } internal WaitForFailedException(string errorMessage, int checkCount, int componentRenderCount, int totalRenderCount, Exception? innerException = null) - : base(errorMessage + $" Check count: {checkCount}. Component render count: {componentRenderCount}. Total render count: {totalRenderCount}.", innerException) + : base(CreateMessage(errorMessage, checkCount, componentRenderCount, totalRenderCount), innerException) + { + } + + private static string CreateMessage( + string errorMessage, + int checkCount, + int componentRenderCount, + int totalRenderCount) { + return $""" + {errorMessage} + + If this test does not fail consistently, the reason may be that + the wait timeout is too short, and the runtime did not have enough + time to complete the necessary number of renders of the component under test. + This can happen on highly utilized or slower hardware, for example. + + To determine if this is the cause, compare the check and render count(s) below + and see if they match what is expected. If they do not, + consider increasing the timeout, either at the individual + method call level, e.g. WaitForElement("div", TimeSpan.FromSeconds(15)), + or via the static TestContext.DefaultWaitTimeout property. + + Check count: {checkCount}. + Component render count: {componentRenderCount}. + Total render count across all components: {totalRenderCount}. + """; } private WaitForFailedException(SerializationInfo info, StreamingContext context) diff --git a/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs b/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs index 033c8c27a..f25ace989 100644 --- a/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs +++ b/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs @@ -10,12 +10,12 @@ namespace Bunit.Extensions.WaitForHelpers; /// public abstract class WaitForHelper : IDisposable { - private readonly Timer timer; private readonly TaskCompletionSource checkPassedCompletionSource; private readonly Func<(bool CheckPassed, T Content)> completeChecker; private readonly IRenderedFragmentBase renderedFragment; private readonly ILogger> logger; private readonly TestRenderer renderer; + private readonly Timer? timer; private bool isDisposed; private int checkCount; private Exception? capturedException; @@ -59,21 +59,38 @@ protected WaitForHelper( .GetRequiredService() .Renderer; checkPassedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - timer = new Timer(_ => - { - logger.LogWaiterTimedOut(renderedFragment.ComponentId); - checkPassedCompletionSource.TrySetException( - new WaitForFailedException( - TimeoutErrorMessage ?? string.Empty, - checkCount, - renderedFragment.RenderCount, - renderer.RenderCount, - capturedException)); - }); + + // Create the wait task and run the initial check + // and subscribe to the OnAfterRender event. + // This must happen before the timer is started, + // as the check happens inside the renderers synchronization context, + // and that may be blocked longer than the timeout on overloaded systems, + // resulting in the timer completing before a single check has + // has a chance to complete. WaitTask = CreateWaitTask(); - timer.Change(GetRuntimeTimeout(timeout), Timeout.InfiniteTimeSpan); + CheckAndInitializeWaiting(); - InitializeWaiting(); + // If the initial check did not complete successfully, + // start the timer and recheck after every render until the timer expires. + if (!WaitTask.IsCompleted) + { + timer = new Timer( + static (state) => + { + var @this = (WaitForHelper)state!; + @this.logger.LogWaiterTimedOut(@this.renderedFragment.ComponentId); + @this.checkPassedCompletionSource.TrySetException( + new WaitForFailedException( + @this.TimeoutErrorMessage ?? string.Empty, + @this.checkCount, + @this.renderedFragment.RenderCount, + @this.renderer.RenderCount, + @this.capturedException)); + }, + this, + GetRuntimeTimeout(timeout), + Timeout.InfiniteTimeSpan); + } } /// @@ -100,13 +117,13 @@ protected virtual void Dispose(bool disposing) return; isDisposed = true; - timer.Dispose(); + timer?.Dispose(); checkPassedCompletionSource.TrySetCanceled(); renderedFragment.OnAfterRender -= OnAfterRender; logger.LogWaiterDisposed(renderedFragment.ComponentId); } - private void InitializeWaiting() + private void CheckAndInitializeWaiting() { if (!WaitTask.IsCompleted) { diff --git a/src/bunit.core/Internal/XUnitExceptions/IAssertionException.cs b/src/bunit.core/Internal/XUnitExceptions/IAssertionException.cs new file mode 100644 index 000000000..bf8db4fd1 --- /dev/null +++ b/src/bunit.core/Internal/XUnitExceptions/IAssertionException.cs @@ -0,0 +1,6 @@ +namespace Bunit.Internal.XUnitExceptions; + +/// +/// This is a marker interface for xUnit.v3 that will cause xUnit to consider the failure cause to be an assertion failure. +/// +internal interface IAssertionException; diff --git a/src/bunit.core/Internal/XUnitExceptions/ITestTimeoutException.cs b/src/bunit.core/Internal/XUnitExceptions/ITestTimeoutException.cs new file mode 100644 index 000000000..aec0961ea --- /dev/null +++ b/src/bunit.core/Internal/XUnitExceptions/ITestTimeoutException.cs @@ -0,0 +1,6 @@ +namespace Bunit.Internal.XUnitExceptions; + +/// +/// This is a marker interface for xUnit.v3 that will cause xUnit to consider the failure cause to be a timeout. +/// +internal interface ITestTimeoutException; diff --git a/src/bunit.core/ParameterException.cs b/src/bunit.core/ParameterException.cs index 66ab60a14..dd9cee220 100644 --- a/src/bunit.core/ParameterException.cs +++ b/src/bunit.core/ParameterException.cs @@ -1,7 +1,7 @@ namespace Bunit.RazorTesting; /// -/// Represents an missing or invalid Blazor parameter on a Blazor component. +/// Represents a missing or invalid Blazor parameter on a Blazor component. /// [Serializable] public sealed class ParameterException : ArgumentException diff --git a/src/bunit.core/Rendering/BunitComponentActivator.cs b/src/bunit.core/Rendering/BunitComponentActivator.cs index e7afdd5c8..3d1e9c1de 100644 --- a/src/bunit.core/Rendering/BunitComponentActivator.cs +++ b/src/bunit.core/Rendering/BunitComponentActivator.cs @@ -7,10 +7,13 @@ internal class BunitComponentActivator : IComponentActivator private readonly ComponentFactoryCollection factories; private readonly IComponentActivator componentActivator; - public BunitComponentActivator(ComponentFactoryCollection factories, IComponentActivator? externalComponentActivator) + public BunitComponentActivator( + IServiceProvider serviceProvider, + ComponentFactoryCollection factories, + IComponentActivator? externalComponentActivator) { this.factories = factories ?? throw new ArgumentNullException(nameof(factories)); - this.componentActivator = externalComponentActivator ?? DefaultComponentActivator.Instance; + this.componentActivator = externalComponentActivator ?? new DefaultComponentActivator(serviceProvider); } public IComponent CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type componentType) @@ -43,12 +46,17 @@ public IComponent CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessed private sealed class DefaultComponentActivator : IComponentActivator { - public static IComponentActivator Instance { get; } = new DefaultComponentActivator(); + private readonly IServiceProvider serviceProvider; + + public DefaultComponentActivator(IServiceProvider serviceProvider) + { + this.serviceProvider = serviceProvider; + } /// public IComponent CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type componentType) - { - return (IComponent)Activator.CreateInstance(componentType)!; + { + return (IComponent)ActivatorUtilities.CreateInstance(serviceProvider, componentType); } } } diff --git a/src/bunit.core/Rendering/ITestRenderer.cs b/src/bunit.core/Rendering/ITestRenderer.cs index 50f8d3e72..cfd855d33 100644 --- a/src/bunit.core/Rendering/ITestRenderer.cs +++ b/src/bunit.core/Rendering/ITestRenderer.cs @@ -78,4 +78,11 @@ IReadOnlyList> FindComponents(IRe /// Disposes all components rendered by the . /// void DisposeComponents(); + +#if NET9_0_OR_GREATER + /// + /// Sets the for the renderer. + /// + void SetRendererInfo(RendererInfo? rendererInfo); +#endif } diff --git a/src/bunit.core/Rendering/MissingRendererInfoException.cs b/src/bunit.core/Rendering/MissingRendererInfoException.cs new file mode 100644 index 000000000..a763a0d98 --- /dev/null +++ b/src/bunit.core/Rendering/MissingRendererInfoException.cs @@ -0,0 +1,36 @@ +#if NET9_0_OR_GREATER +namespace Bunit.Rendering; + +/// +/// Represents an exception that is thrown when a component under test is trying to access the 'RendererInfo' property, which has not been specified. +/// +public sealed class MissingRendererInfoException : Exception +{ + /// + /// Initializes a new instance of the class. + /// + public MissingRendererInfoException() + : base(""" + A component under test is trying to access the 'RendererInfo' property, which has not been specified. Set it via TestContext.Renderer.SetRendererInfo. + + For example: + + public class SomeTestClass : TestContext + { + [Fact] + public void SomeTestCase() + { + SetRendererInfo(new RendererInfo("Server", true)); + ... + } + } + + The four built in render names are 'Static', 'Server', 'WebAssembly', and 'WebView'. + + Go to https://bunit.dev/docs/interaction/render-modes for more information. + """) + { + HelpLink = "https://bunit.dev/docs/interaction/render-modes"; + } +} +#endif diff --git a/src/bunit.core/Rendering/RenderModeMisMatchException.cs b/src/bunit.core/Rendering/RenderModeMisMatchException.cs new file mode 100644 index 000000000..8187988e3 --- /dev/null +++ b/src/bunit.core/Rendering/RenderModeMisMatchException.cs @@ -0,0 +1,22 @@ +#if NET9_0_OR_GREATER +namespace Bunit.Rendering; + +/// +/// Represents an exception that is thrown when a component under test has mismatching render modes assigned between parent and child components. +/// +public sealed class RenderModeMisMatchException : Exception +{ + /// + /// Initializes a new instance of the class. + /// + public RenderModeMisMatchException() + : base(""" + A component under test has mismatching render modes assigned between parent and child components. + Ensure that the render mode of the parent component matches the render mode of the child component. + Learn more about render modes at https://learn.microsoft.com/en-us/aspnet/core/blazor/components/render-modes?view=aspnetcore-9.0#render-mode-propagation. + """) + { + HelpLink = "https://learn.microsoft.com/en-us/aspnet/core/blazor/components/render-modes?view=aspnetcore-9.0#render-mode-propagation"; + } +} +#endif diff --git a/src/bunit.core/Rendering/TestRenderer.cs b/src/bunit.core/Rendering/TestRenderer.cs index bf7449b4e..f26e77fd0 100644 --- a/src/bunit.core/Rendering/TestRenderer.cs +++ b/src/bunit.core/Rendering/TestRenderer.cs @@ -1,7 +1,7 @@ -using Microsoft.Extensions.Logging; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; +using Microsoft.Extensions.Logging; namespace Bunit.Rendering; @@ -64,6 +64,21 @@ private bool IsBatchInProgress /// internal int RenderCount { get; private set; } +#if NET9_0_OR_GREATER + private RendererInfo? rendererInfo; + + /// + [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "The exception is raised to guide users.")] + protected override RendererInfo RendererInfo => rendererInfo ?? throw new MissingRendererInfoException(); + + /// + public void SetRendererInfo(RendererInfo? rendererInfo) + { + this.rendererInfo = rendererInfo; + } + +#endif + #if NETSTANDARD /// /// Initializes a new instance of the class. @@ -79,7 +94,7 @@ public TestRenderer(IRenderedComponentActivator renderedComponentActivator, Test /// Initializes a new instance of the class. /// public TestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory) - : base(services, loggerFactory, new BunitComponentActivator(services.GetRequiredService(), null)) + : base(services, loggerFactory, new BunitComponentActivator(services, services.GetRequiredService(), null)) { logger = loggerFactory.CreateLogger(); this.activator = renderedComponentActivator; @@ -89,7 +104,7 @@ public TestRenderer(IRenderedComponentActivator renderedComponentActivator, Test /// Initializes a new instance of the class. /// public TestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory, IComponentActivator componentActivator) - : base(services, loggerFactory, new BunitComponentActivator(services.GetRequiredService(), componentActivator)) + : base(services, loggerFactory, new BunitComponentActivator(services, services.GetRequiredService(), componentActivator)) { logger = loggerFactory.CreateLogger(); this.activator = renderedComponentActivator; @@ -226,6 +241,64 @@ protected override IComponent ResolveComponentForRenderMode(Type componentType, } #endif +#if NET9_0_OR_GREATER + /// + protected override IComponentRenderMode? GetComponentRenderMode(IComponent component) + { + ArgumentNullException.ThrowIfNull(component); + + // Search from the current component all the way up the render tree. + // All components must have the same render mode specified (or none at all). + // Return the render mode that is found after checking the full tree. + return GetAndValidateRenderMode(component, childRenderMode: null); + + IComponentRenderMode? GetAndValidateRenderMode(IComponent component, IComponentRenderMode? childRenderMode) + { + var componentState = GetComponentState(component); + var renderMode = GetRenderModeForComponent(componentState); + + if (childRenderMode is not null && renderMode is not null && childRenderMode != renderMode) + { + throw new RenderModeMisMatchException(); + } + + return componentState.ParentComponentState is null + ? renderMode ?? childRenderMode + : GetAndValidateRenderMode(componentState.ParentComponentState.Component, renderMode ?? childRenderMode); + } + + IComponentRenderMode? GetRenderModeForComponent(ComponentState componentState) + { + var renderModeAttribute = componentState.Component.GetType().GetCustomAttribute(); + if (renderModeAttribute is { Mode: not null }) + { + return renderModeAttribute.Mode; + } + + if (componentState.ParentComponentState is not null) + { + var parentFrames = GetCurrentRenderTreeFrames(componentState.ParentComponentState.ComponentId); + var foundComponentStart = false; + for (var i = 0; i < parentFrames.Count; i++) + { + ref var frame = ref parentFrames.Array[i]; + + if (frame.FrameType is RenderTreeFrameType.Component) + { + foundComponentStart = frame.ComponentId == componentState.ComponentId; + } + else if (foundComponentStart && frame.FrameType is RenderTreeFrameType.ComponentRenderMode) + { + return frame.ComponentRenderMode; + } + } + } + + return null; + } + } +#endif + /// internal Task SetDirectParametersAsync(IRenderedFragmentBase renderedComponent, ParameterView parameters) { diff --git a/src/bunit.core/TestContextBase.cs b/src/bunit.core/TestContextBase.cs index 9c2fa1e8a..d9e3edce8 100644 --- a/src/bunit.core/TestContextBase.cs +++ b/src/bunit.core/TestContextBase.cs @@ -118,4 +118,14 @@ public void DisposeComponents() { Renderer.DisposeComponents(); } + +#if NET9_0_OR_GREATER + /// + /// Sets the for the renderer. + /// + public void SetRendererInfo(RendererInfo? rendererInfo) + { + Renderer.SetRendererInfo(rendererInfo); + } +#endif } diff --git a/src/bunit.core/bunit.core.csproj b/src/bunit.core/bunit.core.csproj index e1e8b2818..41434ae48 100644 --- a/src/bunit.core/bunit.core.csproj +++ b/src/bunit.core/bunit.core.csproj @@ -14,40 +14,17 @@ - - - - + + + True + \ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/bunit.generators.internal/Web.AngleSharp/WrapperElementGenerator.cs b/src/bunit.generators.internal/Web.AngleSharp/WrapperElementGenerator.cs index b8b294e0a..81d0039e7 100644 --- a/src/bunit.generators.internal/Web.AngleSharp/WrapperElementGenerator.cs +++ b/src/bunit.generators.internal/Web.AngleSharp/WrapperElementGenerator.cs @@ -64,7 +64,7 @@ private static void GenerateOrdinaryMethod(StringBuilder source, IMethodSymbol m var methodParts = method.ToDisplayParts(GeneratorConfig.SymbolFormat); // It seems that the ToDisplayParts will return ... - // + // // public global::AngleSharp.Dom.IShadowRoot AttachShadow(global::AngleSharp.Dom.ShadowRootMode mode = 0) // // when called on a method with a default enum parameters specified. @@ -173,18 +173,6 @@ private static IEnumerable GetAllMembers(this INamedTypeSymbol symbol) } } - private static StringBuilder AppendInputArguments(this StringBuilder source, ImmutableArray parameters) - { - for (int i = 0; i < parameters.Length; i++) - { - if (i > 0) - source.Append(", "); - - source.Append($"{parameters[i].Type.ToDisplayString(GeneratorConfig.SymbolFormat)} {parameters[i].Name}"); - } - return source; - } - private static StringBuilder AppendCallParameters(this StringBuilder source, ImmutableArray parameters) { for (int i = 0; i < parameters.Length; i++) diff --git a/src/bunit.generators.internal/bunit.generators.internal.csproj b/src/bunit.generators.internal/bunit.generators.internal.csproj index baec0ddd1..cae79f712 100644 --- a/src/bunit.generators.internal/bunit.generators.internal.csproj +++ b/src/bunit.generators.internal/bunit.generators.internal.csproj @@ -15,16 +15,10 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - + + + + diff --git a/src/bunit.generators/Directory.Build.props b/src/bunit.generators/Directory.Build.props deleted file mode 100644 index 6e4cd6d46..000000000 --- a/src/bunit.generators/Directory.Build.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/bunit.generators/Web.Stubs/AddStubMethodStubGenerator/AddStubGenerator.cs b/src/bunit.generators/Web.Stubs/AddStubMethodStubGenerator/AddStubGenerator.cs index 907dd6e78..c7fadff33 100644 --- a/src/bunit.generators/Web.Stubs/AddStubMethodStubGenerator/AddStubGenerator.cs +++ b/src/bunit.generators/Web.Stubs/AddStubMethodStubGenerator/AddStubGenerator.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -29,18 +26,17 @@ public void Initialize(IncrementalGeneratorInitializationContext context) context.RegisterSourceOutput( classesToStub, - static (spc, source) => Execute(source, spc)); + static (spc, source) => Execute(source!, spc)); } - private static AddStubClassInfo GetStubClassInfo(GeneratorSyntaxContext context) + private static AddStubClassInfo? GetStubClassInfo(GeneratorSyntaxContext context) { - var invocation = context.Node as InvocationExpressionSyntax; - if (!IsComponentFactoryStubMethod(invocation, context.SemanticModel)) + if (context.Node is not InvocationExpressionSyntax invocation || !IsComponentFactoryStubMethod(invocation, context.SemanticModel)) { return null; } - if (invocation?.Expression is not MemberAccessExpressionSyntax + if (invocation.Expression is not MemberAccessExpressionSyntax { Name: GenericNameSyntax { TypeArgumentList.Arguments.Count: 1 } genericName }) @@ -59,7 +55,7 @@ private static AddStubClassInfo GetStubClassInfo(GeneratorSyntaxContext context) var line = lineSpan.StartLinePosition.Line + 1; var column = lineSpan.Span.Start.Character + context.Node.ToString().IndexOf("AddStub", StringComparison.Ordinal) + 1; - var properties = symbol.GetMembers() + var properties = symbol.GetAllMembersRecursively() .OfType() .Where(IsParameterOrCascadingParameter) .Select(CreateFromProperty) @@ -183,7 +179,7 @@ private static bool GenerateStubComponent(AddStubClassInfo classInfo, SourceProd sourceBuilder.AppendLine($"namespace {classInfo.TargetTypeNamespace};"); sourceBuilder.AppendLine(); sourceBuilder.AppendLine($"internal partial class {classInfo.StubClassName} : global::Microsoft.AspNetCore.Components.ComponentBase"); - sourceBuilder.Append("{"); + sourceBuilder.Append('{'); foreach (var member in classInfo.Properties) { @@ -212,19 +208,19 @@ private static bool GenerateStubComponent(AddStubClassInfo classInfo, SourceProd internal sealed record AddStubClassInfo { - public string StubClassName { get; set; } - public string TargetTypeNamespace { get; set; } - public string TargetTypeName { get; set; } + public required string StubClassName { get; set; } + public required string TargetTypeNamespace { get; set; } + public required string TargetTypeName { get; set; } public string UniqueQualifier => $"{TargetTypeNamespace}.{StubClassName}"; public ImmutableArray Properties { get; set; } = ImmutableArray.Empty; - public string Path { get; set; } + public required string Path { get; set; } public int Line { get; set; } public int Column { get; set; } } internal sealed record StubPropertyInfo { - public string Name { get; set; } - public string Type { get; set; } - public string AttributeLine { get; set; } + public required string Name { get; set; } + public required string Type { get; set; } + public required string AttributeLine { get; set; } } diff --git a/src/bunit.generators/Web.Stubs/AttributeLineGenerator.cs b/src/bunit.generators/Web.Stubs/AttributeLineGenerator.cs index 8185929a2..774b676bd 100644 --- a/src/bunit.generators/Web.Stubs/AttributeLineGenerator.cs +++ b/src/bunit.generators/Web.Stubs/AttributeLineGenerator.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Diagnostics.CodeAnalysis; using System.Text; using Microsoft.CodeAnalysis; @@ -6,6 +6,8 @@ namespace Bunit.Web.Stubs; internal static class AttributeLineGenerator { + [SuppressMessage("SonarLint", "S1862: Unused method parameters should be removed", Justification = "False Positive")] + [SuppressMessage("SonarLint", "S1871: Either merge this branch with the identical one", Justification = "False Positive")] public static string GetAttributeLine(ISymbol member) { var attribute = member.GetAttributes().First(SupportedAttributes.IsSupportedAttribute); @@ -64,7 +66,7 @@ public static string GetAttributeLine(ISymbol member) } } - attributeLine.Append("]"); + attributeLine.Append(']'); return attributeLine.ToString(); } } diff --git a/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttribute.cs b/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttribute.cs index f8c809770..ac206b060 100644 --- a/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttribute.cs +++ b/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttribute.cs @@ -2,7 +2,7 @@ namespace Bunit.Web.Stubs.AttributeStubGenerator; internal static class ComponentStubAttribute { - public static string ComponentStubAttributeSource = $$""" + public const string ComponentStubAttributeSource = $$""" {{HeaderProvider.Header}} #if NET5_0_OR_GREATER diff --git a/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttributeGenerator.cs b/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttributeGenerator.cs index df91cc095..ee778bb1f 100644 --- a/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttributeGenerator.cs +++ b/src/bunit.generators/Web.Stubs/AttributeStubGenerator/ComponentStubAttributeGenerator.cs @@ -1,5 +1,6 @@ using System.Collections.Immutable; -using System.Linq; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; @@ -32,14 +33,15 @@ public void Initialize(IncrementalGeneratorInitializationContext context) context.RegisterSourceOutput( classesToStub, - static (spc, source) => Execute(source, spc)); + static (spc, source) => Execute(source!, spc)); } private static bool IsClassWithComponentStubAttribute(SyntaxNode s) => s is ClassDeclarationSyntax c && c.AttributeLists.SelectMany(a => a.Attributes) .Any(at => at.Name.ToString().Contains("ComponentStub")); - private static StubClassInfo GetStubClassInfo(GeneratorAttributeSyntaxContext context) + [SuppressMessage("Bug", "CA1308: Normalize strings to uppercase", Justification = "On purpose")] + private static StubClassInfo? GetStubClassInfo(GeneratorAttributeSyntaxContext context) { foreach (var attribute in context.TargetSymbol.GetAttributes()) { @@ -50,7 +52,7 @@ private static StubClassInfo GetStubClassInfo(GeneratorAttributeSyntaxContext co var namespaceName = stubbedType.ContainingNamespace.ToDisplayString(); var className = context.TargetSymbol.Name; - var visibility = context.TargetSymbol.DeclaredAccessibility.ToString().ToLower(); + var visibility = context.TargetSymbol.DeclaredAccessibility.ToString().ToLowerInvariant(); var isPartial = ((ClassDeclarationSyntax)context.TargetNode).Modifiers.Any(SyntaxKind.PartialKeyword); var originalTypeToStub = attribute.AttributeClass?.TypeArguments.FirstOrDefault(); @@ -60,7 +62,7 @@ private static StubClassInfo GetStubClassInfo(GeneratorAttributeSyntaxContext co } var parameter = attribute.AttributeClass!.TypeArguments - .SelectMany(s => s.GetMembers()) + .SelectMany(s => s.GetAllMembersRecursively()) .OfType() .Where(IsParameterOrCascadingParameter) .Select(CreateFromProperty) @@ -110,7 +112,7 @@ private static void Execute(StubClassInfo classInfo, SourceProductionContext con sourceBuilder.AppendLine( $"{classInfo.Visibility} partial class {classInfo.ClassName} : global::Microsoft.AspNetCore.Components.ComponentBase"); - sourceBuilder.Append("{"); + sourceBuilder.Append('{'); foreach (var member in classInfo.Properties) { @@ -170,18 +172,18 @@ private static bool CheckDiagnostics(StubClassInfo classInfo, SourceProductionCo internal sealed record StubClassInfo { - public string ClassName { get; set; } - public string Namespace { get; set; } + public required string ClassName { get; set; } + public required string Namespace { get; set; } public ImmutableArray Properties { get; set; } = ImmutableArray.Empty; - public string Visibility { get; set; } + public required string Visibility { get; set; } public bool IsNestedClass { get; set; } public bool IsPartial { get; set; } } internal sealed record StubPropertyInfo { - public string Name { get; set; } - public string Type { get; set; } - public string AttributeLine { get; set; } + public required string Name { get; set; } + public required string Type { get; set; } + public required string AttributeLine { get; set; } } diff --git a/src/bunit.generators/Web.Stubs/MemberRetriever.cs b/src/bunit.generators/Web.Stubs/MemberRetriever.cs new file mode 100644 index 000000000..00ce8950f --- /dev/null +++ b/src/bunit.generators/Web.Stubs/MemberRetriever.cs @@ -0,0 +1,19 @@ +using Microsoft.CodeAnalysis; + +namespace Bunit.Web.Stubs; + +internal static class MemberRetriever +{ + public static IEnumerable GetAllMembersRecursively(this ITypeSymbol type) + { + var currentType = type; + while (currentType is not null) + { + foreach (var member in currentType.GetMembers()) + { + yield return member; + } + currentType = currentType.BaseType; + } + } +} diff --git a/src/bunit.generators/bunit.generators.csproj b/src/bunit.generators/bunit.generators.csproj index dd92ab878..cde790b2c 100644 --- a/src/bunit.generators/bunit.generators.csproj +++ b/src/bunit.generators/bunit.generators.csproj @@ -32,54 +32,29 @@ bUnit.generators is an extension to bUnit that provides code generators for stubbing components. - MIT - https://github.com/bUnit-dev/bUnit - git - https://bunit.egilhansen.com - bUnit;razor components;blazor components;unit testing;testing blazor components;blazor server;blazor wasm - Egil Hansen - Egil Hansen - Egil Hansen - bUnit - true - bunit-logo.png - README.md - - Changes in bUnit #{RELEASE_VERSION}# - - #{RELEASE_NOTES}# - - See the full changelog at https://github.com/bUnit-dev/bUnit/releases - - - True - \ - - - True + + true \ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all - runtime; build; native; contentfiles; analyzers + runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/src/bunit.template/bunit.template.csproj b/src/bunit.template/bunit.template.csproj index 0a44fb6fc..a27501923 100644 --- a/src/bunit.template/bunit.template.csproj +++ b/src/bunit.template/bunit.template.csproj @@ -18,9 +18,16 @@ true false - content + content + + + True + \ + + + @@ -29,7 +36,7 @@ - + diff --git a/src/bunit.template/template/.template.config/dotnetcli.host.json b/src/bunit.template/template/.template.config/dotnetcli.host.json index c8adcf8a7..ced81d900 100644 --- a/src/bunit.template/template/.template.config/dotnetcli.host.json +++ b/src/bunit.template/template/.template.config/dotnetcli.host.json @@ -15,6 +15,7 @@ }, "usageExamples": [ "--framework xunit --sdk net8.0", + "--framework xunitv3 --sdk net8.0", "--framework nunit --sdk net8.0", "--framework mstest --sdk net8.0" ] diff --git a/src/bunit.template/template/.template.config/template.json b/src/bunit.template/template/.template.config/template.json index f926c5c55..81e3820c6 100644 --- a/src/bunit.template/template/.template.config/template.json +++ b/src/bunit.template/template/.template.config/template.json @@ -24,7 +24,7 @@ "modifiers": [ { "exclude": [ "BunitTestContext.cs" ], - "condition": "(testFramework_xunit)" + "condition": "(testFramework_xunit || testFramework_xunitv3)" } ] } @@ -58,6 +58,11 @@ "description": "xUnit unit testing framework", "displayName": "xUnit" }, + { + "choice": "xunitv3", + "description": "xUnit v3 unit testing framework", + "displayName": "xUnit v3" + }, { "choice": "mstest", "description": "MSTest unit testing framework", @@ -73,6 +78,10 @@ "type": "computed", "value": "UnitTestFramework == \"xunit\"" }, + "testFramework_xunitv3": { + "type": "computed", + "value": "UnitTestFramework == \"xunitv3\"" + }, "testFramework_mstest": { "type": "computed", "value": "UnitTestFramework == \"mstest\"" @@ -82,23 +91,18 @@ "description": "The target framework sdk for the project.", "displayName": "Target framework sdk", "datatype": "choice", - "defaultValue": "net7.0", + "defaultValue": "net9.0", "replaces": "targetSdk", "choices": [ - { - "choice": "net6.0", - "description": ".net 6.0", - "displayName": ".net 6.0" - }, - { - "choice": "net7.0", - "description": ".net 7.0", - "displayName": ".net 7.0" - }, { "choice": "net8.0", "description": ".net 8.0", "displayName": ".net 8.0" + }, + { + "choice": "net9.0", + "description": ".net 9.0", + "displayName": ".net 9.0" } ] } diff --git a/src/bunit.template/template/Company.BlazorTests1.csproj b/src/bunit.template/template/Company.BlazorTests1.csproj index 4a443a344..fe62ba21c 100644 --- a/src/bunit.template/template/Company.BlazorTests1.csproj +++ b/src/bunit.template/template/Company.BlazorTests1.csproj @@ -11,35 +11,44 @@ + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + all runtime; build; native; contentfiles; analyzers + + + + all + runtime; build; native; contentfiles; analyzers + + + - - + + - - + + diff --git a/src/bunit.template/template/CounterCSharpTests.cs b/src/bunit.template/template/CounterCSharpTests.cs index 020dfabbd..359fc45c4 100644 --- a/src/bunit.template/template/CounterCSharpTests.cs +++ b/src/bunit.template/template/CounterCSharpTests.cs @@ -6,6 +6,9 @@ namespace Company.BlazorTests1; /// #if (testFramework_xunit) public class CounterCSharpTests : TestContext +#elif (testFramework_xunitv3) +// The full qualified namespace for bUnit TestContext is used here as xunit v3 also offers a TestContext class +public class CounterCSharpTests : Bunit.TestContext #elif (testFramework_nunit) public class CounterCSharpTests : BunitTestContext #elif (testFramework_mstest) @@ -15,6 +18,8 @@ public class CounterCSharpTests : BunitTestContext { #if (testFramework_xunit) [Fact] +#elif (testFramework_xunitv3) + [Fact] #elif (testFramework_nunit) [Test] #elif (testFramework_mstest) @@ -31,6 +36,8 @@ public void CounterStartsAtZero() #if (testFramework_xunit) [Fact] +#elif (testFramework_xunitv3) + [Fact] #elif (testFramework_nunit) [Test] #elif (testFramework_mstest) diff --git a/src/bunit.template/template/CounterRazorTests.razor b/src/bunit.template/template/CounterRazorTests.razor index 7992eda2d..09f4ad12d 100644 --- a/src/bunit.template/template/CounterRazorTests.razor +++ b/src/bunit.template/template/CounterRazorTests.razor @@ -1,5 +1,8 @@ -@*#if (testFramework_xunit)*@ +@*#if (testFramework_xunit) *@ @inherits TestContext +@*#elif (testFramework_xunitv3)*@ +@* The full qualified namespace for bUnit TestContext is used here as xunit v3 also offers a TestContext class *@ +@inherits Bunit.TestContext @*#elif (testFramework_nunit)*@ @inherits BunitTestContext @*#elif (testFramework_mstest)*@ @@ -14,6 +17,8 @@ Learn more at https://bunit.dev/docs/getting-started/writing-tests.html#creating @code { @*#if (testFramework_xunit)*@ [Fact] +@*#elif (testFramework_xunitv3)*@ + [Fact] @*#elif (testFramework_nunit)*@ [Test] @*#elif (testFramework_mstest)*@ @@ -29,6 +34,8 @@ Learn more at https://bunit.dev/docs/getting-started/writing-tests.html#creating } @*#if (testFramework_xunit)*@ [Fact] +@*#elif (testFramework_xunitv3)*@ + [Fact] @*#elif (testFramework_nunit)*@ [Test] @*#elif (testFramework_mstest)*@ diff --git a/src/bunit.template/template/_Imports.razor b/src/bunit.template/template/_Imports.razor index 054402d02..e49ef971e 100644 --- a/src/bunit.template/template/_Imports.razor +++ b/src/bunit.template/template/_Imports.razor @@ -5,6 +5,8 @@ @using Bunit.TestDoubles @*#if (testFramework_xunit)*@ @using Xunit +@*#elif (testFramework_xunitv3)*@ +@using Xunit @*#elif (testFramework_nunit)*@ @using NUnit.Framework @*#elif (testFramework_mstest)*@ diff --git a/src/bunit.web.query/bunit.web.query.csproj b/src/bunit.web.query/bunit.web.query.csproj index 1fedede0d..1ca8a2a01 100644 --- a/src/bunit.web.query/bunit.web.query.csproj +++ b/src/bunit.web.query/bunit.web.query.csproj @@ -14,44 +14,18 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - - - - - - - - - - - - - + + + True + \ + - - - - + + + + + diff --git a/src/bunit.web/Diffing/DiffMarkupFormatter.cs b/src/bunit.web/Diffing/DiffMarkupFormatter.cs index ccb033627..4feffd455 100644 --- a/src/bunit.web/Diffing/DiffMarkupFormatter.cs +++ b/src/bunit.web/Diffing/DiffMarkupFormatter.cs @@ -16,6 +16,7 @@ public class DiffMarkupFormatter : PrettyMarkupFormatter, IMarkupFormatter /// The is not thread safe, so using this singleton /// instance to format elements may not result in the desired effect. /// + [Obsolete("This instance is not thread safe, use a new instance instead.")] public static new readonly DiffMarkupFormatter Instance = new(); /// diff --git a/src/bunit.web/Extensions/ElementRemovedFromDomException.cs b/src/bunit.web/Extensions/ElementRemovedFromDomException.cs index 6bc370599..4b0cf2db0 100644 --- a/src/bunit.web/Extensions/ElementRemovedFromDomException.cs +++ b/src/bunit.web/Extensions/ElementRemovedFromDomException.cs @@ -2,7 +2,7 @@ namespace Bunit; /// /// Represents an exception that is thrown when trying to access an element -/// that was previous found in the DOM. +/// that was previously found in the DOM. /// [Serializable] public sealed class ElementRemovedFromDomException : ElementNotFoundException diff --git a/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs b/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs index 39c6d7395..1611c3772 100644 --- a/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs +++ b/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs @@ -38,9 +38,9 @@ public static void UploadFiles( uploadTask.GetAwaiter().GetResult(); } - if (uploadTask.Exception is { InnerException: not null } e) + if (uploadTask.Exception?.InnerException is IOException e) { - ExceptionDispatchInfo.Capture(e.InnerException).Throw(); + ExceptionDispatchInfo.Capture(e).Throw(); } } } diff --git a/src/bunit.web/Extensions/NodePrintExtensions.cs b/src/bunit.web/Extensions/NodePrintExtensions.cs index c54924824..d113d2642 100644 --- a/src/bunit.web/Extensions/NodePrintExtensions.cs +++ b/src/bunit.web/Extensions/NodePrintExtensions.cs @@ -109,6 +109,7 @@ public static string ToMarkupElementOnly(this IElement element) if (element is null) throw new ArgumentNullException(nameof(element)); + var diffMarkupFormatter = new DiffMarkupFormatter(); var result = new StringBuilder(); result.Append(Symbols.LessThan); @@ -120,7 +121,7 @@ public static string ToMarkupElementOnly(this IElement element) foreach (var attribute in element.Attributes) { - result.Append(' ').Append(DiffMarkupFormatter.Instance.ConvertToString(attribute)); + result.Append(' ').Append(diffMarkupFormatter.ConvertToString(attribute)); } if (element.HasChildNodes) diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs index 59c80ac56..bfaf1c71c 100644 --- a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs +++ b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs @@ -47,9 +47,15 @@ protected internal override Task HandleAsync(JSRuntimeInvocation invocat if (!invocation.Identifier.Equals(JsFunctionsPrefix + "dispose", StringComparison.Ordinal)) { // Assert expectations about the internals of the component +#if !NET9_0_OR_GREATER Debug.Assert(invocation.Identifier.Equals(JsFunctionsPrefix + "init", StringComparison.Ordinal), "Received an unexpected invocation identifier from the component."); Debug.Assert(invocation.Arguments.Count == 3, "Received an unexpected amount of arguments from the component."); Debug.Assert(invocation.Arguments[0] is not null, "Received an unexpected null argument, expected an DotNetObjectReference instance."); +#else + Debug.Assert(invocation.Identifier.Equals(JsFunctionsPrefix + "init", StringComparison.Ordinal)); + Debug.Assert(invocation.Arguments.Count == 3); + Debug.Assert(invocation.Arguments[0] is not null); +#endif InvokeOnSpacerBeforeVisible(invocation.Arguments[0]!); diff --git a/src/bunit.web/Rendering/BunitHtmlParser.cs b/src/bunit.web/Rendering/BunitHtmlParser.cs index f56c008b4..6f8edb5f7 100644 --- a/src/bunit.web/Rendering/BunitHtmlParser.cs +++ b/src/bunit.web/Rendering/BunitHtmlParser.cs @@ -105,7 +105,11 @@ private static (IElement? Context, string? MatchedElement) GetParseContextFromTa int startIndex, IDocument document) { +#if !NET9_0_OR_GREATER Debug.Assert(document.Body is not null, "Body of the document should never be null at this point."); +#else + Debug.Assert(document.Body is not null); +#endif IElement? result = null; diff --git a/src/bunit.web/TestContextWrapper.cs b/src/bunit.web/TestContextWrapper.cs index a6a9c57c0..1ddb194d5 100644 --- a/src/bunit.web/TestContextWrapper.cs +++ b/src/bunit.web/TestContextWrapper.cs @@ -83,6 +83,13 @@ public virtual IRenderedFragment Render(RenderFragment renderFragment) /// public virtual void DisposeComponents() => TestContext?.DisposeComponents(); +#if NET9_0_OR_GREATER + /// + /// Sets the for the renderer. + /// + public virtual void SetRendererInfo(RendererInfo? rendererInfo) => TestContext?.SetRendererInfo(rendererInfo); +#endif + /// /// Dummy method required to allow Blazor's compiler to generate /// C# from .razor files. diff --git a/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs b/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs index 0424e0d53..2112326d5 100644 --- a/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs +++ b/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs @@ -17,7 +17,9 @@ public IEnumerable GetAllStrings(bool includeParentCultures) /// /// Will throw exception to prompt the user. /// +#pragma warning disable S2325 // "WithCulture" is public API and can't be changed public IStringLocalizer WithCulture(CultureInfo culture) +#pragma warning restore S2325 => throw new MissingMockStringLocalizationException(nameof(WithCulture), culture); /// diff --git a/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs b/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs index 574807cf3..85a27b1b4 100644 --- a/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs +++ b/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs @@ -75,13 +75,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options) var absoluteUri = GetNewAbsoluteUri(uri); var changedBaseUri = HasDifferentBaseUri(absoluteUri); - if (changedBaseUri) - { - BaseUri = GetBaseUri(absoluteUri); - } - - Uri = ToAbsoluteUri(uri).OriginalString; - if (options.ReplaceHistoryEntry && history.Count > 0) history.Pop(); @@ -92,7 +85,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options) testContextBase.Renderer.Dispatcher.InvokeAsync(() => #endif { - Uri = absoluteUri.OriginalString; #if NET7_0_OR_GREATER var shouldContinueNavigation = false; @@ -116,6 +108,12 @@ protected override void NavigateToCore(string uri, NavigationOptions options) history.Push(new NavigationHistory(uri, options)); #endif + if (changedBaseUri) + { + BaseUri = GetBaseUri(absoluteUri); + } + + Uri = absoluteUri.OriginalString; // Only notify of changes if user navigates within the same // base url (domain). Otherwise, the user navigated away @@ -125,17 +123,13 @@ protected override void NavigateToCore(string uri, NavigationOptions options) { NotifyLocationChanged(isInterceptedLink: false); } - else - { - BaseUri = GetBaseUri(absoluteUri); - } }); } #endif #if NET7_0_OR_GREATER /// - protected override void SetNavigationLockState(bool value) {} + protected override void SetNavigationLockState(bool value) { } /// protected override void HandleLocationChangingHandlerException(Exception ex, LocationChangingContext context) diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj index 86401722d..10001735d 100644 --- a/src/bunit.web/bunit.web.csproj +++ b/src/bunit.web/bunit.web.csproj @@ -20,86 +20,35 @@ - + + True + \ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - + + diff --git a/src/bunit/bunit.csproj b/src/bunit/bunit.csproj index 95d9e8ab4..4580417ef 100644 --- a/src/bunit/bunit.csproj +++ b/src/bunit/bunit.csproj @@ -4,6 +4,7 @@ true false false + $(NoWarn);NU5128 @@ -20,6 +21,13 @@ + + + True + \ + + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 5c1e49b76..bc6cb5d3e 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -22,17 +22,19 @@ NU1903 - - - - - - - - + + + + + + + + + + - + diff --git a/tests/bunit.core.tests/Rendering/RenderModeTests.razor b/tests/bunit.core.tests/Rendering/RenderModeTests.razor new file mode 100644 index 000000000..557b3386e --- /dev/null +++ b/tests/bunit.core.tests/Rendering/RenderModeTests.razor @@ -0,0 +1,176 @@ +@code{ + #if NET9_0_OR_GREATER +} +@using Bunit.TestAssets.RenderModes; +@inherits TestContext +@code { + [Fact(DisplayName = "TestRenderer provides RendererInfo")] + public void Test001() + { + SetRendererInfo(new RendererInfo("Server", true)); + var cut = RenderComponent(); + + cut.MarkupMatches( + @ +

Is interactive: True

+

Rendermode: Server

+ ); + } + + [Fact(DisplayName = "Renderer throws exception if RendererInfo is not specified")] + public void Test002() + { + Action act = () => RenderComponent(); + + act.ShouldThrow(); + } + + [Fact(DisplayName = "Renderer should set the RenderModeAttribute on the component")] + public void Test003() + { + var cut = RenderComponent(); + + cut.MarkupMatches(@
Assigned render mode: InteractiveServerRenderMode
); + } + + [Fact(DisplayName = "The AssignedRenderMode is based on the RenderModeAttribute in the component hierarchy where parent component has no RenderMode")] + public void Test004() + { + var cut = Render( + @ + + ); + + cut.MarkupMatches( + @ +
Parent assigned render mode:
+
Assigned render mode: InteractiveWebAssemblyRenderMode
+ ); + } + + [Fact(DisplayName = "Parent and child render mode is specified")] + public void Test005() + { + var cut = Render( + @ + + ); + + cut.MarkupMatches( + @ +
Parent assigned render mode: InteractiveServerRenderMode
+
Assigned render mode: InteractiveServerRenderMode
+ ); + } + + [Fact(DisplayName = "Parent and child render mode is not specified")] + public void Test006() + { + var cut = Render( + @ + + ); + + cut.MarkupMatches( + @ +
Parent assigned render mode:
+
Assigned render mode:
+ ); + } + + [Fact(DisplayName = "Rendermode specified on child")] + public void Test007() + { + var cut = Render( + @ + + ); + + cut.MarkupMatches(@

Assigned Render Mode: InteractiveServerRenderMode

); + } + + [Fact(DisplayName = "Assigned Render Mode is inherited all the way down the component hierarchy")] + public void Test008() + { + var cut = Render( + @ + + + + ); + + cut.MarkupMatches(@

Assigned Render Mode: InteractiveServerRenderMode

); + } + + [Fact(DisplayName = "Having a component with section outlet and RenderMode is specifying for child component")] + public void Test009() + { + // See: https://learn.microsoft.com/en-us/aspnet/core/blazor/components/sections?view=aspnetcore-8.0#section-interaction-with-other-blazor-features + var cut = Render(@); + + cut.MarkupMatches(@

Assigned Render Mode: InteractiveWebAssemblyRenderMode

); + } + + [Fact(DisplayName = "Assigned Render Mode on siblings")] + public void Test010() + { + var cut = Render( + @ + + + ); + + cut.MarkupMatches( + @ +

Assigned Render Mode: InteractiveServerRenderMode

+

Assigned Render Mode: InteractiveWebAssemblyRenderMode

+ ); + } + + [Fact(DisplayName = "SetAssignedRenderMode on root component")] + public void Test011() + { + var cut = RenderComponent(ps => ps.SetAssignedRenderMode(RenderMode.InteractiveServer)); + cut.MarkupMatches(@

Assigned Render Mode: InteractiveServerRenderMode

); + } + + [Fact(DisplayName = "SetAssignedRenderMode on parent component cascades to children")] + public void Test012() + { + var cut = RenderComponent(ps => ps + .SetAssignedRenderMode(RenderMode.InteractiveWebAssembly) + .AddChildContent()); + + cut.MarkupMatches(@

Assigned Render Mode: InteractiveWebAssemblyRenderMode

); + } + + [Fact(DisplayName = "SetAssignedRenderMode child components")] + public void Test013() + { + var cut = RenderComponent(ps => ps + .AddChildContent(pps => pps.SetAssignedRenderMode(RenderMode.InteractiveServer)) + .AddChildContent(pps => pps.SetAssignedRenderMode(RenderMode.InteractiveWebAssembly))); + + cut.MarkupMatches( + @ +

Assigned Render Mode: InteractiveServerRenderMode

+

Assigned Render Mode: InteractiveWebAssemblyRenderMode

+ ); + } + + [Fact(DisplayName = "Different assigned RenderMode between child and parent throws")] + public void Test020() + { + var act = () => Render( + @ + + + + ); + + act.ShouldThrow(); + } +} +@code{ + #endif +} diff --git a/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs b/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs index cb3d256a2..f54aa345c 100644 --- a/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs +++ b/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs @@ -67,7 +67,7 @@ public void Test013(string key) { var fakeState = this.AddFakePersistentComponentState(); - fakeState.TryTake(key, out var actual).ShouldBeFalse(); + fakeState.TryTake(key, out _).ShouldBeFalse(); } [Fact(DisplayName = "TriggerOnPersisting triggers OnPersisting callbacks added to store")] diff --git a/tests/bunit.core.tests/bunit.core.tests.csproj b/tests/bunit.core.tests/bunit.core.tests.csproj index 62e64bfdd..55fcbfa41 100644 --- a/tests/bunit.core.tests/bunit.core.tests.csproj +++ b/tests/bunit.core.tests/bunit.core.tests.csproj @@ -13,13 +13,7 @@ - - - - all - runtime; build; native; contentfiles; analyzers - NU1701 - + - + \ No newline at end of file diff --git a/tests/bunit.core.tests/xunit.runner.json b/tests/bunit.core.tests/xunit.runner.json deleted file mode 100644 index e37151e81..000000000 --- a/tests/bunit.core.tests/xunit.runner.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", - "diagnosticMessages": false -} diff --git a/tests/bunit.generators.tests/Directory.Build.props b/tests/bunit.generators.tests/Directory.Build.props deleted file mode 100644 index 1e156caa2..000000000 --- a/tests/bunit.generators.tests/Directory.Build.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/tests/bunit.generators.tests/Web.Stub/AddStubGeneratorTests.cs b/tests/bunit.generators.tests/Web.Stub/AddStubGeneratorTests.cs index df54ed6f2..17c3dc44c 100644 --- a/tests/bunit.generators.tests/Web.Stub/AddStubGeneratorTests.cs +++ b/tests/bunit.generators.tests/Web.Stub/AddStubGeneratorTests.cs @@ -61,7 +61,42 @@ public void Generated_stub_via_attribute_has_same_parameters() var stub = cut.FindComponent(); Assert.Equal("test", stub.Instance.Text); } + + [Fact] + public void Generated_Stub_respects_base_class_parameters() + { + ComponentFactories.AddStub(); + + var cut = RenderComponent(c => c.AddChildContent()); + + var stub = cut.FindComponent(); + Assert.Equal(0, stub.Instance.BaseCount); + } + + [Fact] + public void Generated_stub_via_attribute_respects_base_class_parameters() + { + ComponentFactories.Add(); + + var cut = RenderComponent(c => c.AddChildContent()); + + var stub = cut.FindComponent(); + Assert.Equal(0, stub.Instance.BaseCount); + } } [ComponentStub] -public partial class ButtonComponentStub; \ No newline at end of file +public partial class ButtonComponentStub; + +public abstract class BaseComponent : ComponentBase +{ + [Parameter] public int BaseCount { get; set; } +} + +public class DerivedComponent : BaseComponent +{ + [Parameter] public int DerivedCount { get; set; } +} + +[ComponentStub] +public partial class DerivedComponentStubViaAttributeAnnotation; \ No newline at end of file diff --git a/tests/bunit.generators.tests/Web.Stub/Components/ContainerComponent.cs b/tests/bunit.generators.tests/Web.Stub/Components/ContainerComponent.cs new file mode 100644 index 000000000..5cbbbb298 --- /dev/null +++ b/tests/bunit.generators.tests/Web.Stub/Components/ContainerComponent.cs @@ -0,0 +1,14 @@ +namespace Bunit.Web.Stub.Components; + +public class ContainerComponent : ComponentBase +{ + [Parameter] + public RenderFragment ChildContent { get; set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenElement(0, "div"); + builder.AddContent(1, ChildContent); + builder.CloseElement(); + } +} diff --git a/tests/bunit.generators.tests/Web.Stub/Components/CounterComponent.cs b/tests/bunit.generators.tests/Web.Stub/Components/CounterComponent.cs index a8ca311b7..b0b6e5def 100644 --- a/tests/bunit.generators.tests/Web.Stub/Components/CounterComponent.cs +++ b/tests/bunit.generators.tests/Web.Stub/Components/CounterComponent.cs @@ -7,6 +7,12 @@ public class CounterComponent : ComponentBase { [Parameter] public int Count { get; set; } [CascadingParameter(Name = "Cascading")] public int CascadingCount { get; set; } - [Parameter(CaptureUnmatchedValues = true)] public Dictionary UnmatchedValues { get; set; } - [Required] public string Unused { get; set; } + + [Parameter(CaptureUnmatchedValues = true)] + private Dictionary? UnmatchedValues { get; set; } + + [SuppressMessage("Design", "CS0246: The type or namespace name could not be found", + Justification = "This is on purpose")] + [Required] + public string Unused { get; set; } = default!; } diff --git a/tests/bunit.generators.tests/bunit.generators.tests.csproj b/tests/bunit.generators.tests/bunit.generators.tests.csproj index 236bac0a1..89098229e 100644 --- a/tests/bunit.generators.tests/bunit.generators.tests.csproj +++ b/tests/bunit.generators.tests/bunit.generators.tests.csproj @@ -8,27 +8,20 @@ true false true + false true $(InterceptorsPreviewNamespaces);Bunit - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - + + + + + + + + @@ -37,4 +30,8 @@ + + + + diff --git a/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor b/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor index 1c05a7166..ba4bca194 100644 --- a/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor +++ b/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor @@ -10,7 +10,7 @@ Child components follow. @code { int numAdded = 0; - List currentChildrenMessages = new List(); + private readonly List currentChildrenMessages = new List(); void AddChild() { diff --git a/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor b/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor index 435ef0fc0..06567bb4a 100644 --- a/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor +++ b/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor @@ -1,5 +1,5 @@
@TabId
@code { - string TabId = "17"; + private readonly string TabId = "17"; } diff --git a/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor b/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor index 20899324f..837da0f95 100644 --- a/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor +++ b/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor @@ -13,7 +13,7 @@ @functions { - Dictionary elementValues = new Dictionary + private readonly Dictionary elementValues = new Dictionary { { "bool", true }, { "string", "middle-value" }, diff --git a/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor b/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor index dd96e41d5..d5931408d 100644 --- a/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor +++ b/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor @@ -9,7 +9,7 @@ Type here: @code { - List keysPressed = new List(); + private readonly List keysPressed = new List(); void OnKeyPressed(KeyboardEventArgs eventArgs) { diff --git a/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor b/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor index ee7f9a185..1b9597319 100644 --- a/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor +++ b/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor @@ -28,7 +28,7 @@ #nullable disable bool changeOutput; - string myMarkup = "

This is a markup string.

"; + private readonly string myMarkup = "

This is a markup string.

"; void EmitMarkupBlock(RenderTreeBuilder builder) { diff --git a/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor b/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor index fbb1f4cf5..872b35bc2 100644 --- a/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor +++ b/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor @@ -41,7 +41,7 @@ @code { #nullable disable - List items = new List + private readonly List items = new List { new TodoItem { Text = "Alpha" }, new TodoItem { Text = "Beta" }, @@ -49,7 +49,7 @@ new TodoItem { Text = "Delta", IsDone = true }, }; - class TodoItem + private sealed class TodoItem { public bool IsDone { get; set; } public string Text { get; set; } diff --git a/tests/bunit.testassets/BlazorE2E/OrderedList.razor b/tests/bunit.testassets/BlazorE2E/OrderedList.razor index 96130629b..f7a712635 100644 --- a/tests/bunit.testassets/BlazorE2E/OrderedList.razor +++ b/tests/bunit.testassets/BlazorE2E/OrderedList.razor @@ -6,7 +6,7 @@ } @foreach (var item in Items) { - @Template(new Context { Index = index++, Item = item, }); + @Template(new Context { Index = index++, Item = item, }) } diff --git a/tests/bunit.testassets/DumpCapture.cs b/tests/bunit.testassets/DumpCapture.cs new file mode 100644 index 000000000..2f3a1ebfd --- /dev/null +++ b/tests/bunit.testassets/DumpCapture.cs @@ -0,0 +1,92 @@ +using System.Diagnostics; +using System.Runtime.CompilerServices; +using Xunit.Abstractions; + +namespace Bunit.TestAssets; + +/// +/// Wrap a test action or function in a try-catch block that captures a dump file if the test fails. +/// +/// +/// This requires the dotnet-dump tool to be installed as a local dotnet tool. +/// +public static class DumpCapture +{ + + public static async Task OnFailureAsync( + Action testAction, + ITestOutputHelper outputHelper, + [CallerMemberName] string testName = "", + [CallerFilePath] string testFilePath = "") + { + try + { + testAction(); + } + catch + { + await CaptureDump(testName, testFilePath, outputHelper); + throw; + } + } + + public static async Task OnFailureAsync( + Func testAction, + ITestOutputHelper outputHelper, + [CallerMemberName] string testName = "", + [CallerFilePath] string testFilePath = "") + { + try + { + await testAction(); + } + catch + { + await CaptureDump(testName, testFilePath, outputHelper); + throw; + } + } + + private static async Task CaptureDump(string testName, string testFilePath, ITestOutputHelper outputHelper) + { +#if NETSTANDARD2_1 + var processId = Process.GetCurrentProcess().Id; +#else + var processId = Environment.ProcessId; +#endif + var dumpFilePath = Path.Combine(Directory.GetCurrentDirectory(), $"{Path.GetFileNameWithoutExtension(testFilePath)}-{testName}-wait-failed-{Guid.NewGuid()}.dmp"); + // Attempt to start the dotnet-dump process + var startInfo = new ProcessStartInfo + { + FileName = "dotnet", + Arguments = $"dotnet-dump collect -p {processId} -o {dumpFilePath}", + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + CreateNoWindow = true + }; + using var process = Process.Start(startInfo); + if (process is null) + { + outputHelper.WriteLine(" Failed to start dotnet-dump process."); + return; + } + +#if NETSTANDARD2_1 + process.WaitForExit(); +#else + await process.WaitForExitAsync(); +#endif + var output = await process.StandardOutput.ReadToEndAsync(); + var error = await process.StandardError.ReadToEndAsync(); + outputHelper.WriteLine($"Dump status: {{process.ExitCode}}. Dump file: {dumpFilePath}"); + if (!string.IsNullOrWhiteSpace(output)) + { + outputHelper.WriteLine($"Dump output: {output}"); + } + if (!string.IsNullOrWhiteSpace(error)) + { + outputHelper.WriteLine($"Dump error: {error}"); + } + } +} diff --git a/tests/bunit.testassets/RenderModes/ComponentThatPrintsAssignedRenderMode.razor b/tests/bunit.testassets/RenderModes/ComponentThatPrintsAssignedRenderMode.razor new file mode 100644 index 000000000..effe0ff2c --- /dev/null +++ b/tests/bunit.testassets/RenderModes/ComponentThatPrintsAssignedRenderMode.razor @@ -0,0 +1,9 @@ +@{ +#if NET9_0_OR_GREATER +} + +

Assigned Render Mode: @AssignedRenderMode?.GetType().Name

+ +@{ +#endif +} diff --git a/tests/bunit.testassets/RenderModes/ComponentWithChildContent.razor b/tests/bunit.testassets/RenderModes/ComponentWithChildContent.razor new file mode 100644 index 000000000..c8b0cd4e1 --- /dev/null +++ b/tests/bunit.testassets/RenderModes/ComponentWithChildContent.razor @@ -0,0 +1,6 @@ +@ChildContent +@code { + + [Parameter] public RenderFragment ChildContent { get; set; } = default!; + +} \ No newline at end of file diff --git a/tests/bunit.testassets/RenderModes/ComponentWithServerRenderMode.razor b/tests/bunit.testassets/RenderModes/ComponentWithServerRenderMode.razor new file mode 100644 index 000000000..dd008df6c --- /dev/null +++ b/tests/bunit.testassets/RenderModes/ComponentWithServerRenderMode.razor @@ -0,0 +1,15 @@ +@{ +#if NET9_0_OR_GREATER +} + +@rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer +
@(ChildContent is not null ? "Parent assigned" : "Assigned") render mode: @AssignedRenderMode?.GetType().Name
+@ChildContent + +@code { + [Parameter] public RenderFragment? ChildContent { get; set; } +} + +@{ +#endif +} diff --git a/tests/bunit.testassets/RenderModes/ComponentWithWebAssemblyRenderMode.razor b/tests/bunit.testassets/RenderModes/ComponentWithWebAssemblyRenderMode.razor new file mode 100644 index 000000000..af0888317 --- /dev/null +++ b/tests/bunit.testassets/RenderModes/ComponentWithWebAssemblyRenderMode.razor @@ -0,0 +1,15 @@ +@{ +#if NET9_0_OR_GREATER +} + +@rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveWebAssembly +
@(ChildContent is not null ? "Parent assigned" : "Assigned") render mode: @AssignedRenderMode?.GetType().Name
+@ChildContent + +@code { + [Parameter] public RenderFragment? ChildContent { get; set; } +} + +@{ +#endif +} \ No newline at end of file diff --git a/tests/bunit.testassets/RenderModes/ComponentWithoutRenderMode.razor b/tests/bunit.testassets/RenderModes/ComponentWithoutRenderMode.razor new file mode 100644 index 000000000..6d5f7f9b7 --- /dev/null +++ b/tests/bunit.testassets/RenderModes/ComponentWithoutRenderMode.razor @@ -0,0 +1,14 @@ +@{ +#if NET9_0_OR_GREATER +} + +
@(ChildContent is not null ? "Parent assigned" : "Assigned") render mode: @AssignedRenderMode?.GetType().Name
+@ChildContent + +@code { + [Parameter] public RenderFragment? ChildContent { get; set; } +} + +@{ +#endif +} \ No newline at end of file diff --git a/tests/bunit.testassets/RenderModes/RendererInfoComponent.cs b/tests/bunit.testassets/RenderModes/RendererInfoComponent.cs new file mode 100644 index 000000000..9393ab3eb --- /dev/null +++ b/tests/bunit.testassets/RenderModes/RendererInfoComponent.cs @@ -0,0 +1,20 @@ +#if NET9_0_OR_GREATER + +namespace Bunit.TestAssets.RenderModes; + +public class RendererInfoComponent : ComponentBase +{ + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenElement(0, "p"); + builder.AddContent(1, "Is interactive: "); + builder.AddContent(2, RendererInfo.IsInteractive); + builder.CloseElement(); + + builder.OpenElement(3, "p"); + builder.AddContent(4, "Rendermode: "); + builder.AddContent(5, RendererInfo.Name); + builder.CloseElement(); + } +} +#endif \ No newline at end of file diff --git a/tests/bunit.testassets/RenderModes/SectionOutletComponent.cs b/tests/bunit.testassets/RenderModes/SectionOutletComponent.cs new file mode 100644 index 000000000..70dd7d9a1 --- /dev/null +++ b/tests/bunit.testassets/RenderModes/SectionOutletComponent.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Components.Web; + +#if NET8_0_OR_GREATER +using Microsoft.AspNetCore.Components.Sections; +#endif + +namespace Bunit.TestAssets.RenderModes; + +public class SectionOutletComponent : ComponentBase +{ +#if NET8_0_OR_GREATER + private static readonly Guid SectionId = Guid.NewGuid(); +#endif + + [Parameter] public RenderFragment ChildContent { get; set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { +#if NET8_0_OR_GREATER + builder.OpenComponent(0); + builder.AddComponentParameter(1, nameof(SectionOutlet.SectionId), SectionId); + builder.AddComponentRenderMode(RenderMode.InteractiveWebAssembly); + builder.CloseComponent(); + builder.OpenComponent(10); + builder.AddComponentParameter(11, nameof(SectionContent.SectionId), SectionId); + builder.AddAttribute(12, nameof(SectionContent.ChildContent), ChildContent); + builder.CloseComponent(); +#endif + } +} diff --git a/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor b/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor index e4368832a..4e68b7eb6 100644 --- a/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor +++ b/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor @@ -1,7 +1,7 @@ @code { - private TaskCompletionSource _tcs = new TaskCompletionSource(); + private readonly TaskCompletionSource _tcs = new TaskCompletionSource(); public int Counter; private Task Tick() diff --git a/tests/bunit.testassets/SampleComponents/ConstructorInjectionComponent.cs b/tests/bunit.testassets/SampleComponents/ConstructorInjectionComponent.cs new file mode 100644 index 000000000..7b99ac4b1 --- /dev/null +++ b/tests/bunit.testassets/SampleComponents/ConstructorInjectionComponent.cs @@ -0,0 +1,13 @@ +using Microsoft.JSInterop; + +namespace Bunit.TestAssets.SampleComponents; + +public class ConstructorInjectionComponent : ComponentBase +{ + public IJSRuntime JSRuntime { get; } + + public ConstructorInjectionComponent(IJSRuntime jsRuntime) + { + JSRuntime = jsRuntime; + } +} diff --git a/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor b/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor index 9be4161b2..1abdf2cd8 100644 --- a/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor +++ b/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor @@ -22,13 +22,13 @@ { registeredTask = task; delegatedTask = task == null ? null : DelegateTo(task); - RenderWhenDone(); + _ = RenderWhenDone(); } base.OnParametersSet(); } - private async void RenderWhenDone() + private async Task RenderWhenDone() { var task = delegatedTask; if (task != null) @@ -44,7 +44,7 @@ private static async Task DelegateTo(Task task) { - await task;//.ConfigureAwait(false); + await task; return null; } } diff --git a/tests/bunit.testassets/SampleComponents/RenderOnClick.razor b/tests/bunit.testassets/SampleComponents/RenderOnClick.razor index d5ed71b16..b42b04388 100644 --- a/tests/bunit.testassets/SampleComponents/RenderOnClick.razor +++ b/tests/bunit.testassets/SampleComponents/RenderOnClick.razor @@ -2,8 +2,11 @@ @code { public int RenderCount { get; private set; } - - void IncreaseCount() { } + + void IncreaseCount() + { + // Left empty on purpose + } protected override void OnAfterRender(bool firstRender) => RenderCount++; } \ No newline at end of file diff --git a/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor b/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor index 9992ee117..d077d54b0 100644 --- a/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor +++ b/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor @@ -6,7 +6,7 @@ @code { protected override void OnInitialized() { - var localizedString = StringLocalizer["StringName"]; + _ = StringLocalizer["StringName"]; } } diff --git a/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor b/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor index 0ba4abec3..700fcdc83 100644 --- a/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor +++ b/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor @@ -1,7 +1,7 @@ @typeparam T @foreach (var d in Data) { - @Template?.Invoke(d); + @Template?.Invoke(d) } @code { diff --git a/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor b/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor index 5dcb306e3..b1cf9da25 100644 --- a/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor +++ b/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor @@ -3,7 +3,7 @@ {

Read the details carefully!

} -
+
Summary

Detailed content

diff --git a/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs b/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs index 71e49829e..7ced47dc8 100644 --- a/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs +++ b/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs @@ -3,6 +3,7 @@ namespace Xunit; +[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)] public sealed class RepeatAttribute : DataAttribute { public int Count { get; } diff --git a/tests/bunit.testassets/XunitExtensions/TheoryDataExtensions.cs b/tests/bunit.testassets/XunitExtensions/TheoryDataExtensions.cs index 505c1edcc..22d975164 100644 --- a/tests/bunit.testassets/XunitExtensions/TheoryDataExtensions.cs +++ b/tests/bunit.testassets/XunitExtensions/TheoryDataExtensions.cs @@ -7,7 +7,7 @@ public static TheoryData Clone(this TheoryData existing) var result = new TheoryData(); foreach (var item in existing) { - result.Add((T)item[0]); + result.Add(item); } return result; } diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj index d9746eafc..183551378 100644 --- a/tests/bunit.testassets/bunit.testassets.csproj +++ b/tests/bunit.testassets/bunit.testassets.csproj @@ -14,49 +14,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/tests/bunit.web.query.tests/bunit.web.query.tests.csproj b/tests/bunit.web.query.tests/bunit.web.query.tests.csproj index f37f4ff1d..c9c1da279 100644 --- a/tests/bunit.web.query.tests/bunit.web.query.tests.csproj +++ b/tests/bunit.web.query.tests/bunit.web.query.tests.csproj @@ -14,13 +14,7 @@ - - - - all - runtime; build; native; contentfiles; analyzers - NU1701 - + \ No newline at end of file diff --git a/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor index 5c22485fc..d4b3bf5c4 100644 --- a/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor +++ b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor @@ -1,35 +1,32 @@ @using Bunit.TestAssets.SampleComponents @inherits TestContext - @code { - - [Fact] - public void MarkupMatchesShouldNotBeBlockedByRenderer() - { - var tcs = new TaskCompletionSource(); - - var cut = Render(@ ); - - cut.MarkupMatches(@loading); - - tcs.SetResult(true); - - cut.WaitForAssertion(() => cut.MarkupMatches(@done)); - } - - [SuppressMessage("Usage", "xUnit1026:Theory method does not use parameter")] - [Theory] - [Repeat(2)] - public void MarkupMatchesShouldNotBeBlockedByRendererComplex(int repeatCount) - { - var tcs = new TaskCompletionSource(); - - var cut = Render(@ ); - - cut.MarkupMatches(@waiting); - - tcs.SetResult(true); - - cut.WaitForAssertion(() => cut.MarkupMatches(@done)); - } + public MarkupMatchesTests() + { + DefaultWaitTimeout = TimeSpan.FromSeconds(30); + } + + [Fact] + public void MarkupMatchesShouldNotBeBlockedByRenderer() + { + var tcs = new TaskCompletionSource(); + var cut = Render(@ ); + cut.MarkupMatches(@loading ); + + tcs.SetResult(true); + + cut.WaitForAssertion(() => cut.MarkupMatches(@done)); + } + + [Fact] + public void MarkupMatchesShouldNotBeBlockedByRendererComplex() + { + var tcs = new TaskCompletionSource(); + var cut = Render(@ ); + cut.MarkupMatches(@waiting); + + tcs.SetResult(true); + + cut.WaitForAssertion(() => cut.MarkupMatches(@done)); + } } diff --git a/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensions.Async.Test.cs b/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensions.Async.Test.cs index 24ab80b0e..70eb139d6 100644 --- a/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensions.Async.Test.cs +++ b/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensions.Async.Test.cs @@ -61,8 +61,7 @@ public async Task Test022() expected.InnerException.ShouldBeNull(); } - [Fact(DisplayName = "WaitForElements with specific count N throws exception after timeout when cssSelector does not result in N matching elements", - Skip = "Need to figure out how to make this deterministic.")] + [Fact(DisplayName = "WaitForElements with specific count N throws exception after timeout when cssSelector does not result in N matching elements")] [Trait("Category", "async")] public async Task Test023() { diff --git a/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensionsTest.cs b/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensionsTest.cs index 98844fc00..4ec41fda2 100644 --- a/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensionsTest.cs +++ b/tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensionsTest.cs @@ -61,7 +61,7 @@ public void Test022() expected.InnerException.ShouldBeNull(); } - [Fact(DisplayName = "WaitForElements with specific count N throws exception after timeout when cssSelector does not result in N matching elements", Skip = "Need to figure out how to make this deterministic.")] + [Fact(DisplayName = "WaitForElements with specific count N throws exception after timeout when cssSelector does not result in N matching elements")] [Trait("Category", "sync")] public void Test023() { diff --git a/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs b/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs index 7df771ecb..4ca33d9c9 100644 --- a/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs +++ b/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs @@ -11,9 +11,9 @@ namespace Bunit.JSInterop.ComponentSupport; public class VirtualizeJSRuntimeInvocationHandlerTest : TestContext { - public static readonly IEnumerable ItemsInCollection = new object[][] + public static readonly TheoryData ItemsInCollection = new() { - new object[] { 0 }, new object[] { 7 }, new object[] { 30 }, new object[] { 60 }, new object[] { 100 }, new object[] { 300 }, new object[] { 500 }, + 0, 7, 30, 60, 100, 300, 500, }; [Theory(DisplayName = "Can render component using with ChildContent")] @@ -22,6 +22,9 @@ public void Test001(int itemsInDataSource) { var cut = RenderComponent>(ps => ps .Add(p => p.Items, CreateItems(itemsInDataSource)) +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.ChildContent, item => $"

{item}

")); cut.FindAll("p").Count.ShouldBe(itemsInDataSource); @@ -33,6 +36,9 @@ public void Test002(int itemsInDataSource) { var cut = RenderComponent>(ps => ps .Add(p => p.Items, CreateItems(itemsInDataSource)) +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.ItemContent, item => $"

{item}

")); cut.FindAll("p").Count.ShouldBe(itemsInDataSource); @@ -44,6 +50,9 @@ public void Test010(int itemsInDataSource) { var cut = RenderComponent>(ps => ps .Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource)) +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.ChildContent, item => $"

{item}

")); cut.FindAll("p").Count.ShouldBe(itemsInDataSource); @@ -55,21 +64,59 @@ public void Test011(int itemsInDataSource) { var cut = RenderComponent>(ps => ps .Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource)) +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.ItemContent, item => $"

{item}

")); cut.FindAll("p").Count.ShouldBe(itemsInDataSource); } - public static readonly IEnumerable ItemCountItemSizeOverscanCount = - ItemsInCollection.Select(x => new object[][] - { - new object[] { x[0], 1, 3 }, - new object[] { x[0], 1_000_000, 3 }, - new object[] { x[0], 50, 1 }, - new object[] { x[0], 50, 1_000_000 }, - new object[] { x[0], 1, 1 }, - new object[] { x[0], 1_000_000, 1_000_000 }, - }).SelectMany(x => x); + public static readonly TheoryData ItemCountItemSizeOverscanCount = new() + { + { 0, 1, 3 }, + { 0, 1_000_000, 3 }, + { 0, 50, 1 }, + { 0, 50, 1_000_000 }, + { 0, 1, 1 }, + { 0, 1_000_000, 1_000_000 }, + { 7, 1, 3 }, + { 7, 1_000_000, 3 }, + { 7, 50, 1 }, + { 7, 50, 1_000_000 }, + { 7, 1, 1 }, + { 7, 1_000_000, 1_000_000 }, + { 30, 1, 3 }, + { 30, 1_000_000, 3 }, + { 30, 50, 1 }, + { 30, 50, 1_000_000 }, + { 30, 1, 1 }, + { 30, 1_000_000, 1_000_000 }, + { 60, 1, 3 }, + { 60, 1_000_000, 3 }, + { 60, 50, 1 }, + { 60, 50, 1_000_000 }, + { 60, 1, 1 }, + { 60, 1_000_000, 1_000_000 }, + { 100, 1, 3 }, + { 100, 1_000_000, 3 }, + { 100, 50, 1 }, + { 100, 50, 1_000_000 }, + { 100, 1, 1 }, + { 100, 1_000_000, 1_000_000 }, + { 300, 1, 3 }, + { 300, 1_000_000, 3 }, + { 300, 50, 1 }, + { 300, 50, 1_000_000 }, + { 300, 1, 1 }, + { 300, 1_000_000, 1_000_000 }, + { 500, 1, 3 }, + { 500, 1_000_000, 3 }, + { 500, 50, 1 }, + { 500, 50, 1_000_000 }, + { 500, 1, 1 }, + { 500, 1_000_000, 1_000_000 } + }; [Theory(DisplayName = "Can render component using and different ItemSize and OverscanCount")] [MemberData(nameof(ItemCountItemSizeOverscanCount))] @@ -79,6 +126,9 @@ public void Test030(int itemsInDataSource, float itemSize, int overscanCount) .Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource)) .Add(p => p.ItemContent, item => $"

{item}

") .Add(p => p.ItemSize, itemSize) +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.OverscanCount, overscanCount)); cut.FindAll("p").Count.ShouldBe(itemsInDataSource); @@ -91,6 +141,9 @@ public void Test040(int itemsInDataSource) var cut = RenderComponent>(ps => ps .Add(p => p.ItemsProvider, _ => ValueTask.FromResult(new ItemsProviderResult(Array.Empty(), itemsInDataSource))) .Add(p => p.ItemContent, item => @$"

{item}

") +#if NET9_0_OR_GREATER + .Add(p => p.MaxItemCount, itemsInDataSource) +#endif .Add(p => p.Placeholder, _ => @"

")); cut.FindAll(".placeholder").Count.ShouldBe(itemsInDataSource); diff --git a/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs b/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs index a4dd4a0d9..412779aad 100644 --- a/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs +++ b/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs @@ -57,4 +57,14 @@ public void Test020() Should.Throw(() => target.Instance); } + #if NET9_0_OR_GREATER + + [Fact(DisplayName = "Component with constructor dependencies is resolved when rendered")] + public void Test021() + { + var cut = RenderComponent(); + + cut.Instance.JSRuntime.ShouldNotBeNull(); + } + #endif } diff --git a/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs b/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs index e8a274fab..1578dfe28 100644 --- a/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs +++ b/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs @@ -1,5 +1,6 @@ using System.Text.Json; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; +using Shouldly.ShouldlyExtensionMethods; namespace Bunit.TestDoubles; @@ -106,18 +107,18 @@ public void Test007() } #if !NET6_0_OR_GREATER - [Theory(DisplayName = "NavigateTo(uri, forceLoad) is saved in history")] - [InlineData("/uri", false)] - [InlineData("/anotherUri", true)] - public void Test100(string uri, bool forceLoad) - { - var sut = CreateFakeNavigationManager(); + [Theory(DisplayName = "NavigateTo(uri, forceLoad) is saved in history")] + [InlineData("/uri", false)] + [InlineData("/anotherUri", true)] + public void Test100(string uri, bool forceLoad) + { + var sut = CreateFakeNavigationManager(); - sut.NavigateTo(uri, forceLoad); + sut.NavigateTo(uri, forceLoad); - sut.History.ShouldHaveSingleItem() - .ShouldBeEquivalentTo(new NavigationHistory(uri, new NavigationOptions(forceLoad))); - } + sut.History.ShouldHaveSingleItem() + .ShouldBeEquivalentTo(new NavigationHistory(uri, new NavigationOptions(forceLoad))); + } #endif #if NET6_0_OR_GREATER [Theory(DisplayName = "NavigateTo(uri, forceLoad, replaceHistoryEntry) is saved in history")] @@ -135,8 +136,12 @@ public void Test200(string uri, bool forceLoad, bool replaceHistoryEntry) .ShouldBeEquivalentTo(new NavigationHistory(uri, new NavigationOptions { ForceLoad = forceLoad, ReplaceHistoryEntry = replaceHistoryEntry })); #elif NET7_0_OR_GREATER - var navigationOptions = new NavigationOptions { ForceLoad = forceLoad, ReplaceHistoryEntry = - replaceHistoryEntry }; + var navigationOptions = new NavigationOptions + { + ForceLoad = forceLoad, + ReplaceHistoryEntry = + replaceHistoryEntry + }; sut.History.ShouldHaveSingleItem() .ShouldBeEquivalentTo(new NavigationHistory(uri, navigationOptions, NavigationState.Succeeded)); #endif @@ -156,8 +161,11 @@ public void Test201() new NavigationOptions { ReplaceHistoryEntry = true })); #elif NET7_0_OR_GREATER sut.History.ShouldHaveSingleItem() - .ShouldBeEquivalentTo(new NavigationHistory("/secondUrl", new NavigationOptions { ReplaceHistoryEntry = - true }, NavigationState.Succeeded)); + .ShouldBeEquivalentTo(new NavigationHistory("/secondUrl", new NavigationOptions + { + ReplaceHistoryEntry = + true + }, NavigationState.Succeeded)); #endif } #endif @@ -230,7 +238,8 @@ public void Test013() var fakeNavigationManager = CreateFakeNavigationManager(); var requestOptions = new InteractiveRequestOptions { - ReturnUrl = "return", Interaction = InteractionType.SignIn, + ReturnUrl = "return", + Interaction = InteractionType.SignIn, }; requestOptions.TryAddAdditionalParameter("library", "bunit"); @@ -264,7 +273,7 @@ public void Test015() Should.Throw( () => fakeNavigationManager.History.Last().StateFromJson()); } - + [Fact(DisplayName = "Navigate to url with state should set that state on the NavigationManager")] public void Test016() { @@ -275,7 +284,7 @@ public void Test016() sut.HistoryEntryState.ShouldBe(State); } - + [Fact(DisplayName = "Navigate to url with force reload resets state")] public void Test017() { @@ -283,11 +292,32 @@ public void Test017() var sut = CreateFakeNavigationManager(); sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State }); - sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State, ForceLoad = true}); + sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State, ForceLoad = true }); sut.HistoryEntryState.ShouldBe(null); } + [Theory(DisplayName = "Preventing Navigation does not change Uri or BaseUri")] + [InlineData("/prevented-path")] + [InlineData("https://bunit.dev/uri")] + public void Test018(string navToUri) + { + var sut = CreateFakeNavigationManager(); + using var handler = sut.RegisterLocationChangingHandler(LocationChangingHandler); + + sut.NavigateTo(navToUri); + + sut.History.First().State.ShouldBe(NavigationState.Prevented); + sut.BaseUri.ShouldBe("http://localhost/"); + sut.Uri.ShouldBe("http://localhost/"); + + ValueTask LocationChangingHandler(LocationChangingContext arg) + { + arg.PreventNavigation(); + return ValueTask.CompletedTask; + } + } + private sealed class InterceptNavigateToCounterComponent : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) @@ -356,7 +386,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) builder.CloseComponent(); } - private void InterceptNavigation(LocationChangingContext context) + private static void InterceptNavigation(LocationChangingContext context) { throw new NotSupportedException("Don't intercept"); } diff --git a/tests/bunit.web.tests/bunit.web.tests.csproj b/tests/bunit.web.tests/bunit.web.tests.csproj index 09885c8f4..b5319668b 100644 --- a/tests/bunit.web.tests/bunit.web.tests.csproj +++ b/tests/bunit.web.tests/bunit.web.tests.csproj @@ -13,13 +13,7 @@ - - - - all - runtime; build; native; contentfiles; analyzers - NU1701 - + - + \ No newline at end of file diff --git a/tests/bunit.web.tests/xunit.runner.json b/tests/bunit.web.tests/xunit.runner.json deleted file mode 100644 index e37151e81..000000000 --- a/tests/bunit.web.tests/xunit.runner.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", - "diagnosticMessages": false -} diff --git a/tests/xunit.runner.json b/tests/xunit.runner.json new file mode 100644 index 000000000..2197c2b2b --- /dev/null +++ b/tests/xunit.runner.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", + "diagnosticMessages": false, + "methodDisplayOptions": "all", + "parallelAlgorithm": "conservative", + "maxParallelThreads": "2x", + "parallelizeTestCollections": true +} diff --git a/version.json b/version.json index d009bb001..16a7c71ab 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.31-preview", + "version": "1.39-preview", "assemblyVersion": { "precision": "revision" },

- - @Progress-Telerik -
- Progress Telerik - - 		@syncfusion @@ -59,10 +45,10 @@ A huge thank you to the [sponsors of my work with bUnit](https://github.com/spon - - @aws + + @JetBrainsOfficial
- Amazon Web Services + JetBrains