Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Test framework on main #5399

Merged
merged 5 commits into from
Oct 12, 2022
Merged

Conversation

JanKrivanek
Copy link
Member

Problem

initial implementation of #3868
Contains only changes from already reviewed PRs:

Checks:

  • Added unit tests
  • Added #nullable enable to all the modified files ?

vlada-shubina and others added 3 commits September 7, 2022 17:59
* Initial implementation of the test command and API

* Disable diff tool in CI

* Use new Verifier, Add verification options

* Add 3rd party signing info

* Remove dependency on test project

* Use custom exceptions for exit expectations failed

* Improve engine API, add API tests

* Add localizations, move types

* Various improvements for PR

* Add the uninstalled template testing option

* Add integration tests and unit tests

* Add VerifyEngine unit tests, add ability to place expectations in code base or current dir

* Add sample usage in unit test

* Adjust assertions (OS agnostic)

* Fix code locations
@JanKrivanek JanKrivanek requested a review from a team as a code owner October 11, 2022 16:24
@JanKrivanek
Copy link
Member Author

JanKrivanek commented Oct 11, 2022

/backport to release/7.0.2xx

1 similar comment
@JanKrivanek
Copy link
Member Author

/backport to release/7.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3228575661

@github-actions
Copy link
Contributor

@JanKrivanek backporting to release/7.0.2xx failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: repurposed existing CLI tool and MSBuild tasks for authoring
Using index info to reconstruct a base tree...
M	Microsoft.TemplateEngine.sln
Falling back to patching base and 3-way merge...
Removing src/Microsoft.TemplateEngine.TemplateLocalizer/Globals.cs
Auto-merging Microsoft.TemplateEngine.sln
CONFLICT (content): Merge conflict in Microsoft.TemplateEngine.sln
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 repurposed existing CLI tool and MSBuild tasks for authoring
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@JanKrivanek JanKrivanek mentioned this pull request Oct 12, 2022
2 tasks
@JanKrivanek JanKrivanek merged commit eed8d31 into dotnet:main Oct 12, 2022
@JanKrivanek JanKrivanek deleted the test-framework-on-main branch October 12, 2022 09:00
@JanKrivanek
Copy link
Member Author

/backport to release/7.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3234940411

@github-actions
Copy link
Contributor

@JanKrivanek an error occurred while backporting to release/7.0.2xx, please check the run log for details!

Error: @JanKrivanek is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your Microsoft team membership visibility is set to Public on https://github.com/orgs/microsoft/people?query=JanKrivanek

@JanKrivanek
Copy link
Member Author

/backport to release/7.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3235370219

@github-actions
Copy link
Contributor

@JanKrivanek backporting to release/7.0.2xx failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: repurposed existing CLI tool and MSBuild tasks for authoring
Using index info to reconstruct a base tree...
M	Microsoft.TemplateEngine.sln
M	src/Microsoft.TemplateEngine.Tasks/Utilities/MSBuildLogger.cs
M	src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs
M	test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandFailureTests.cs
M	test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs
Auto-merging test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs
Removing src/Microsoft.TemplateEngine.TemplateLocalizer/Globals.cs
Auto-merging src/Microsoft.TemplateEngine.Authoring.Tasks/Utilities/MSBuildLogger.cs
Auto-merging src/Microsoft.TemplateEngine.Authoring.CLI/Commands/localize/export/ExportCommand.cs
CONFLICT (content): Merge conflict in src/Microsoft.TemplateEngine.Authoring.CLI/Commands/localize/export/ExportCommand.cs
Auto-merging Microsoft.TemplateEngine.sln
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 repurposed existing CLI tool and MSBuild tasks for authoring
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

JanKrivanek added a commit to JanKrivanek/templating that referenced this pull request Oct 12, 2022
* repurposed existing CLI tool and MSBuild tasks for authoring

* Initial implementation of the test command and API (dotnet#5263)

* Initial implementation of the test command and API

* Disable diff tool in CI

* Use new Verifier, Add verification options

* Add 3rd party signing info

* Remove dependency on test project

* Use custom exceptions for exit expectations failed

* Improve engine API, add API tests

* Add localizations, move types

* Various improvements for PR

* Add the uninstalled template testing option

* Add integration tests and unit tests

* Add VerifyEngine unit tests, add ability to place expectations in code base or current dir

* Add sample usage in unit test

* Adjust assertions (OS agnostic)

* Fix code locations

* Fix analyzer errors

* Adjust sample dogfood test for CI

Co-authored-by: Vlada Shubina <vshubina@microsoft.com>
@JanKrivanek
Copy link
Member Author

/backport to release/7.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3243821169

@github-actions
Copy link
Contributor

@JanKrivanek an error occurred while backporting to release/7.0.2xx, please check the run log for details!

Error: @JanKrivanek is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your Microsoft team membership visibility is set to Public on https://github.com/orgs/microsoft/people?query=JanKrivanek

@JanKrivanek
Copy link
Member Author

/backport to release/7.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3243849745

@github-actions
Copy link
Contributor

@JanKrivanek backporting to release/7.0.2xx failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: repurposed existing CLI tool and MSBuild tasks for authoring
Using index info to reconstruct a base tree...
M	Microsoft.TemplateEngine.sln
M	src/Microsoft.TemplateEngine.Tasks/Utilities/MSBuildLogger.cs
M	src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs
M	test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandFailureTests.cs
M	test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs
Auto-merging test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs
Removing src/Microsoft.TemplateEngine.TemplateLocalizer/Globals.cs
Auto-merging src/Microsoft.TemplateEngine.Authoring.Tasks/Utilities/MSBuildLogger.cs
Auto-merging src/Microsoft.TemplateEngine.Authoring.CLI/Commands/localize/export/ExportCommand.cs
CONFLICT (content): Merge conflict in src/Microsoft.TemplateEngine.Authoring.CLI/Commands/localize/export/ExportCommand.cs
Auto-merging Microsoft.TemplateEngine.sln
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 repurposed existing CLI tool and MSBuild tasks for authoring
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

JanKrivanek added a commit that referenced this pull request Oct 14, 2022
* Test framework on main (#5399)

* repurposed existing CLI tool and MSBuild tasks for authoring

* Initial implementation of the test command and API (#5263)

* Initial implementation of the test command and API

* Disable diff tool in CI

* Use new Verifier, Add verification options

* Add 3rd party signing info

* Remove dependency on test project

* Use custom exceptions for exit expectations failed

* Improve engine API, add API tests

* Add localizations, move types

* Various improvements for PR

* Add the uninstalled template testing option

* Add integration tests and unit tests

* Add VerifyEngine unit tests, add ability to place expectations in code base or current dir

* Add sample usage in unit test

* Adjust assertions (OS agnostic)

* Fix code locations

* Fix analyzer errors

* Adjust sample dogfood test for CI

Co-authored-by: Vlada Shubina <vshubina@microsoft.com>

* Pack TemplateVerifier as standard package (#5422)

Co-authored-by: Vlada Shubina <vshubina@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants