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

Add additional tests for ddlGen that aligns with proposed doc #30157

Merged
merged 8 commits into from
Nov 18, 2024

Conversation

KyleAure
Copy link
Member

@KyleAure KyleAure commented Nov 13, 2024

  • I have considered the risk of behavior change or other zero migration impact (https://github.com/OpenLiberty/open-liberty/wiki/Behavior-Changes).

  • If this PR fixes an Issue, the description includes "Fixes #FILLMEIN" or "Resolves #FILLMEIN" (verify release bug label if applicable: https://github.com/OpenLiberty/open-liberty/wiki/Open-Liberty-Conventions).

  • If this PR resolves an external Known Issue (including APARS), the description includes "Fixes #FILLMEIN" or "Resolves #FILLMEIN".

  • Refactors DatabaseContainerUtil to allow for more nuanced AuthData replacement.

  • Adds unit testing for DatabaseContainerUtil

  • Adds ddlGen tests for the following scenarios:

    • defaultDataSource
    • dataSource ID
    • dataSource jndiName
    • dataSource resourceRef
    • persistenceUnit resourceRef

Tests align with proposed doc: OpenLiberty/docs#7468
While also testing additional persistence paradigms such as @MappedSuperclass and @Inheritance in combination with ddlGen.

@KyleAure KyleAure self-assigned this Nov 13, 2024
@KyleAure KyleAure changed the title test: Add unit tests for DatabaseContainerUtil Add additional tests for ddlGen that aligns with proposed doc Nov 13, 2024
@KyleAure KyleAure requested a review from gjwatts November 13, 2024 21:57
@KyleAure
Copy link
Member Author

#libby - check headers
#build - personal build - make sure changes to fattest.simplicity didn't break any other builds

@contbld
Copy link
Collaborator

contbld commented Nov 13, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=274b0373-feb7-43cc-b393-07b5b1ddabfb

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 13, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=fc3519e5-a2cd-4fc4-b4ad-ed51aeed28cb

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 13, 2024

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • 17 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

  • 8 test infrastructure code files were changed.

  • Test failures/errors in the build could be due to these changes.

@contbld
Copy link
Collaborator

contbld commented Nov 13, 2024

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • 17 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

  • 8 test infrastructure code files were changed.

  • Test failures/errors in the build could be due to these changes.

@contbld
Copy link
Collaborator

contbld commented Nov 13, 2024

@KyleAure
Copy link
Member Author

Database rotation personal build: https://libh-proxy1.fyre.ibm.com/cognitive-dev/pipelineAnalysis.html?pipelineId=60ebf452-4fb8-4c53-bb05-80e91e4301eb

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_YjDc4KJEEe-kGLEyqlUFUA

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 14, 2024

@KyleAure KyleAure requested a review from njr-11 November 14, 2024 20:05
@@ -69,12 +68,19 @@ public static void setUp() throws Exception {
DDLGenScriptResult result = DDLGenScript.build(server)
.execute()
.assertSuccessful()
.assertDDLFile("application[DDLGenTestApp].module[DDLGenTestApp.war].databaseStore[java.comp.DefaultDataSource]_JakartaData.ddl")
.assertDDLFile("application[DDLGenTestApp].databaseStore[TestDataSource]_JakartaData.ddl")
.assertDDLFile("application[DDLGenTestApp].databaseStore[jdbc.TestDataSourceJndi]_JakartaData.ddl")
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we end up writing two separate files if the same dataSource is referenced by repositories where one references the jndiName and the other references its id?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question. I'll add that test scenario in an additional pull request. My initial assumption is that they would go to different files, since we use the dataStore attribute of @Repository to create the databaseStore config.id at runtime.

@KyleAure
Copy link
Member Author

#build - redo personal build after fixing prior build breaks
#libby - recheck headers

@contbld
Copy link
Collaborator

contbld commented Nov 15, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=1760c804-cdf7-4969-a38f-49ea5038a5e0

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 15, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=0aecc270-0021-4275-aebe-011ddd5d7d12

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 15, 2024

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • 17 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

  • 8 test infrastructure code files were changed.

  • Test failures/errors in the build could be due to these changes.

1 similar comment
@contbld
Copy link
Collaborator

contbld commented Nov 15, 2024

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • 17 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

  • 8 test infrastructure code files were changed.

  • Test failures/errors in the build could be due to these changes.

@contbld
Copy link
Collaborator

contbld commented Nov 15, 2024

@KyleAure
Copy link
Member Author

Personal Database SOE: https://libh-proxy1.fyre.ibm.com/cognitive-dev/pipelineAnalysis.html?pipelineId=413ec17b-6719-484a-90f3-2e2ba75d7c9b

Target locations of links might be accessible only to IBM employees.

@contbld
Copy link
Collaborator

contbld commented Nov 16, 2024

@LibbyBot
Copy link

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_gNXY4KPTEe-kGLEyqlUFUA

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • Please describe in a separate comment how you tested your changes.

  • 8 test infrastructure code files were changed.

  • Test failures/errors in the build could be due to these changes.

  • 18 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

@KyleAure
Copy link
Member Author

KyleAure commented Nov 16, 2024

Build Results:

Pipeline: Passed successfully
RTC Build: Parallel execution timed out, but thus far no test errors.
Database SOE: Failed, 5 known defects, 1 connection issue

@KyleAure KyleAure merged commit 8c9b4e1 into OpenLiberty:integration Nov 18, 2024
4 checks passed
@KyleAure KyleAure deleted the ddlgen-doc-examples branch November 18, 2024 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants