test: Migrate flow-polymer-template tests to JUnit 6 (#23625) (CP: 25.1)#23838
Merged
vaadin-bot merged 1 commit into25.1from Mar 11, 2026
Merged
test: Migrate flow-polymer-template tests to JUnit 6 (#23625) (CP: 25.1)#23838vaadin-bot merged 1 commit into25.1from
vaadin-bot merged 1 commit into25.1from
Conversation
* refactor: Migrate flow-polymer-template tests to JUnit 5 * fix: address PR review comments for JUnit 5 migration Move setup code outside assertThrows lambdas so only the expected-to-throw call remains inside. Restore specific getter/setter calls in TemplateModelTest NotSupportedModel tests. Remove stale commented-out @disabled annotation in CompositeTest. * fix: restore public visibility on bean setters and fix remaining review issues Bean setter methods in test inner classes need public visibility for reflection-based access by the template model system. Also make TemplateModelTest class package-private and move setup code outside assertThrows lambda in TemplateModelWithEncodersTest. * fix: assertThrows for twoEventHandlerMethodsWithTheSameName The exception is thrown during component construction (handler method validation), not during invokeMethod. Wrap only the constructor call in assertThrows. * test: assertThrows lambdas contain only the throwing call in TemplateModelTest Split NotSupportedModel into two interfaces so that method-signature tests can construct the template outside assertThrows. The long-type methods cause eager validation during construction, while invalid method signatures are validated lazily during proxy invocation. Also fix TemplateModelProxyHandler.intercept to validate method signatures before calling getPropertyName, which avoids an AssertionError from the assert in ReflectTools.getPropertyName. * fix: defer unsupported type validation to property access time BeanModelType.getModelType() threw InvalidTemplateModelException eagerly during template construction for unsupported types like long, making it impossible to test getter/setter behavior separately. Introduce UnsupportedModelType that stores the error and defers throwing to modelToApplication/applicationToModel calls. This allows tests to construct the template and verify the exception is thrown when the actual getter or setter is invoked. * test: revert deferred unsupported type validation, merge primitive tests Revert BeanModelType and UnsupportedModelType production changes per reviewer feedback. Merge testUnsupportedPrimitiveSetter and testUnsupportedPrimitiveGetter into a single testUnsupportedPrimitiveProperty that asserts on the error message from template construction. * Revert unnecessary change
Collaborator
Author
|
This PR is eligible for auto-merging policy, so it has been approved automatically. If there are pending conditions, auto merge (with 'squash' method) has been enabled for this PR [Message is sent from bot] |
vaadin-review-bot
approved these changes
Mar 11, 2026
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR cherry-picks changes from the original PR #23625 to branch 25.1.
Original PR description