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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[4.x] - Add @RequestScoped support for testing #7916

Merged
merged 29 commits into from
Dec 7, 2023
Merged

[4.x] - Add @RequestScoped support for testing #7916

merged 29 commits into from
Dec 7, 2023

Conversation

dalexandrov
Copy link
Contributor

Resolves #7564 for 4.x

@dalexandrov
Add @RequestScoped support
ec3b0db 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov dalexandrov added testing 4.x Version 4.x labels Oct 30, 2023
@dalexandrov dalexandrov self-assigned this Oct 30, 2023
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Oct 30, 2023
@dalexandrov
Add JaxRs support for Request-scoped beans.
3c28cdf 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov dalexandrov requested review from danielkec and removed request for tomas-langer October 31, 2023 08:55
@dalexandrov dalexandrov marked this pull request as ready for review October 31, 2023 08:55
danielkec
danielkec requested changes Nov 6, 2023
View reviewed changes
microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddJaxRs.java Show resolved Hide resolved
docs/mp/testing-ng.adoc Outdated Show resolved Hide resolved
docs/mp/testing.adoc Outdated Show resolved Hide resolved
...sting/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonJunitExtension.java Show resolved Hide resolved
...rc/test/java/io/helidon/microprofile/tests/testing/junit5/TestReqScopeDisabledDiscovery.java Outdated Show resolved Hide resolved
...rc/test/java/io/helidon/microprofile/tests/testing/testng/TestReqScopeDisabledDiscovery.java Outdated Show resolved Hide resolved
...rc/test/java/io/helidon/microprofile/tests/testing/junit5/TestReqScopeDisabledDiscovery.java Outdated Show resolved Hide resolved
docs/mp/testing-ng.adoc Outdated Show resolved Hide resolved
@dalexandrov
Refactoring to separate module
a7f196d 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Add Bean support
836e6bf 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Refactor. Reuse in TestNG.
d8a7f18 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Add validation support. First iteration.
38c50db 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
extract validation
f6f00f5 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Move validation back to common
e319e70 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov dalexandrov changed the title [4.x] - Add @RequestScoped support for testing [3.x] - Add @RequestScoped support for testing Nov 20, 2023
@dalexandrov dalexandrov reopened this Nov 20, 2023
@dalexandrov dalexandrov changed the title [3.x] - Add @RequestScoped support for testing [4.x] - Add @RequestScoped support for testing Nov 20, 2023
@dalexandrov
Naming cleanup
c903648 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Should be only on class
c51dbc2 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@trentjeff
Copy link
Member

Would like to see this backported to 2.x

@dalexandrov
Copy link
Contributor Author

Would like to see this backported to 2.x

In progress

@dalexandrov
Minor clean up
ea9af2a 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Dependency fix
7eed160 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@barchetta barchetta added this to the 4.0.2 milestone Nov 22, 2023
danielkec
danielkec requested changes Nov 27, 2023
View reviewed changes
...ofile/testing/common/src/main/java/io/helidon/microprofile/testing/common/TestValidator.java Outdated Show resolved Hide resolved
...rc/test/java/io/helidon/microprofile/tests/testing/testng/TestReqScopeDisabledDiscovery.java Outdated Show resolved Hide resolved
microprofile/testing/testng/pom.xml Outdated Show resolved Hide resolved
...sting/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java Outdated Show resolved Hide resolved
...file/testing/common/src/main/java/io/helidon/microprofile/testing/common/JaxRsValidator.java Outdated Show resolved Hide resolved
microprofile/testing/testng/src/main/java/module-info.java Outdated Show resolved Hide resolved
...sting/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java Show resolved Hide resolved
...sting/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java Show resolved Hide resolved
dalexandrov and others added 8 commits November 29, 2023 11:10
@dalexandrov @danielkec
Update microprofile/testing/common/src/main/java/io/helidon/microprof…
bc91012 
…ile/testing/common/TestValidator.java

Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/tests/testing/testng/src/test/java/io/helidon/mic…
5704bae 
…roprofile/tests/testing/testng/TestReqScopeDisabledDiscovery.java

Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/testing/testng/pom.xml
efd0ebc 
Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/testing/testng/src/main/java/io/helidon/microprof…
fef4450 
…ile/testing/testng/HelidonTestNgListener.java

Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/testing/testng/src/main/java/module-info.java
19074bf 
Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/testing/testng/src/main/java/io/helidon/microprof…
808fff8 
…ile/testing/testng/HelidonTestNgListener.java

Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov @danielkec
Update microprofile/testing/testng/src/main/java/io/helidon/microprof…
20b25be 
…ile/testing/testng/HelidonTestNgListener.java

Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
@dalexandrov
Move validator to modules
e62a48c 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
tomas-langer
tomas-langer requested changes Nov 29, 2023
View reviewed changes
Copy link
Member

@tomas-langer tomas-langer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering we always add the dependency, there is no service loader to load extensions, and that we want to keep this bacwkard compatible, I do not think this design is what we want.
The simplest solution here would be to just add the @AddJaxRs annotation directly to the list of annotation in the existing testing module (so we do not introduce a set of new Common annotations.
As long as we keept the dependency on MP Server optional, this should be sufficient.

microprofile/testing/junit5/pom.xml Outdated
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This introduces a provided dependency on MP Server to MP testing.
The extension was written in a way that there is no dependency on MP server (e.g. it can be used to test just CDI without Server).
I am not sure this is the right solution.

@dalexandrov
Copy link
Contributor Author

Considering we always add the dependency, there is no service loader to load extensions, and that we want to keep this bacwkard compatible, I do not think this design is what we want. The simplest solution here would be to just add the @AddJaxRs annotation directly to the list of annotation in the existing testing module (so we do not introduce a set of new Common annotations. As long as we keept the dependency on MP Server optional, this should be sufficient.

This was my first version of the PR :)

@dalexandrov
Rollback to simple design
480757e 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Rollback to simple design
22132ca 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Mino clean up
67362f9 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Clean dependency tree
8484dc3 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Copyright fix
a1d4cc7 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Apply comments
c82f046 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Merge branch 'main' into 7564_add_JaxRs-annotation
b56a6fb
@dalexandrov
Fix copyright
722c95f 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov
Fix dependencies
d3ccf55 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
@dalexandrov dalexandrov requested a review from danielkec December 6, 2023 17:25
@dalexandrov dalexandrov merged commit df64dfa into helidon-io:main Dec 7, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trentjeff trentjeff trentjeff left review comments

@tomas-langer tomas-langer tomas-langer approved these changes

@danielkec danielkec danielkec approved these changes

Assignees

@dalexandrov dalexandrov

Labels
4.x Version 4.x OCA Verified All contributors have signed the Oracle Contributor Agreement. testing
Projects
None yet
Milestone
4.0.2
Development

Successfully merging this pull request may close these issues.

@HelidonTest request scope support without discovery
5 participants
@dalexandrov @trentjeff @danielkec @tomas-langer @barchetta