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

[master] OXM Tests move from MOXy to Core module #1341

Merged
merged 3 commits into from
Oct 25, 2021

Conversation

rfelcman
Copy link
Contributor

Main reason for this change is, that OXM tests are focused on Core module functionality not MOXy JAXB implementation.
Due this change there are some code changes in the following tests/test suites:

  • org.eclipse.persistence.testing.oxm/jaxb.converter.ConverterTestSuite
    There is split of test cases: ObjectTypeConverterTestCases is moved to the OXM/Core
    TypeSafeEnumConverterTestCases, JAXBEnumTypeConverterTestCases and related classes remains in MOXy as these test cases testing JAXB/MOXy functionality org.eclipse.persistence.jaxb.JAXBTypesafeEnumConverter

  • New org.eclipse.persistence.testing.oxm.OXMXMLComparer in Core.test and current org.eclipse.persistence.testing.jaxb.JAXBXMLComparer in MOXy inherits functionality.

  • In moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller resource path changes to reflect new resource files location org/eclipse/persistence/testing/oxm/jaxb/ -> org/eclipse/persistence/testing/jaxb/xmlmarshaller/

  • .../src/test/resources/sessions.xml split: as some sessions specified there are related with OXM and some with MOXy tests

  • GenerateSchemaTestCases: comparer change from org.eclipse.persistence.testing.jaxb.JAXBXMLComparer to org.eclipse.persistence.testing.oxm.OXMXMLComparer as tests were moved into OXM/Core.test scope

There is some change in bundles/nightly/pom.xml as OXM html report published at the Nightly builds page now is produced by Core.test module instead of MOXy module.

I tried to move all unit tests src/test from org.eclipse.persistence.core.test to org.eclipse.persistence.core module to simplify project structure but there are some blockers due dependency to org.eclipse.persistence.core.test.framework module. It's not related with moved OXM tests, but with current tests in Core.test module.

Signed-off-by: Radek Felcman [email protected]

Signed-off-by: Radek Felcman <[email protected]>
@lukasj
Copy link
Member

lukasj commented Oct 19, 2021

OXM tests do have no dependency on the test framework, why can't they be moved to the core module instead?

@rfelcman rfelcman changed the title [master] OXM Tests move from MOXy to Core.test module [master] OXM Tests move from MOXy to Core module Oct 21, 2021
@rfelcman
Copy link
Contributor Author

OXM tests do have no dependency on the test framework, why can't they be moved to the core module instead?

OK OXM tests are now in org.eclipse.persistence.core.
To reflect this change, there are additionally following changes:

  • in the Jenkins pr_verify.groovy pipeline is stage('OXM LRG') added
  • additional test dependencies in foundation/eclipselink.core.test/pom.xml
  • new foundation/org.eclipse.persistence.core/src/test/java/module-info.java as JPMS is used in MOXy test scope too
  • some changes in moxy/org.eclipse.persistence.moxy/src/test/java/module-info.java

Copy link
Member

@lukasj lukasj left a comment

Choose a reason for hiding this comment

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

LGTM

@lukasj lukasj merged commit 2a414ff into eclipse-ee4j:master Oct 25, 2021
@rfelcman rfelcman deleted the maven_build_oxm_tests_move branch September 23, 2022 09:18
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