-
Notifications
You must be signed in to change notification settings - Fork 16
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
Update Quarkus Data API uses to 3.9.5 (from parent 3.6.x) #1246
Conversation
@@ -175,7 +175,7 @@ public void testIncorrectContentTypeXML() { | |||
.withSubscriber(UniAssertSubscriber.create()) | |||
.awaitFailure() | |||
.getFailure(); | |||
assertThat(exception.getCause()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is strange: Quarkus version seems to have changed wrapping of exceptions, affecting 3 test methods in this test class, but nowhere else.
(upgrade from Q 3.6 to 3.9)
@@ -26,8 +26,8 @@ | |||
import org.junit.jupiter.api.Test; | |||
|
|||
@QuarkusTest | |||
@TestProfile(CqlSessionCacheTimingTests.TestProfile.class) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't have to rename, but everything else called ...Test
, not ...Tests
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This commit fixes failing unit and integration tests. It cherry picks multiple commits from the ajm/tables branch below. -> SKIPPED - did not cherry pick the original see below <- commit 0b53fba Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:34:14 2024 -0700 Revert UT->IT cherry-picked merge commit 951a092 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:32:20 2024 -0700 Minor clean up of test contexts, javadocs commit 28c9ebb Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:21:20 2024 -0700 Minor clean up commit 9801566 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:09:18 2024 -0700 Fix import stmt -> merge commit - not cherry picked <- commit b14dfa2 Merge: 13678a5 a9cb436 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 16:49:10 2024 -0700 Merge branch 'main' into ajm/tables -> came from merge, not cherry picked <- commit a9cb436 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 16:47:00 2024 -0700 Update Quarkus Data API uses to 3.9.5 (from parent 3.6.x) (#1246) -> merge commit - not cherry picked <- commit 13678a5 Merge: c7eccc0 dd42485 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 12:29:49 2024 -0700 Merge branch 'main' into ajm/tables -> came from merge, not cherry picked <- commit dd42485 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 11:40:21 2024 -0700 Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) (#1248) -> came from merge, not cherry picked <- commit 15cd3f6 Author: YuqiDu <istimdu@gmail.com> Date: Tue Jul 9 10:31:03 2024 -0700 fix http port to 8181, refactor application.yaml as alphabetic order (#1247) -> came from merge, not cherry picked <- commit ce2b337 Author: YuqiDu <istimdu@gmail.com> Date: Tue Jul 9 09:19:11 2024 -0700 Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) (#1191) Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com> commit c7eccc0 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:31:31 2024 +1200 fmt fix commit 64930f5 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:28:42 2024 +1200 Unit test fixes for Namespace commands -> merge commit - not cherry picked <- commit e7a6d15 Merge: baa6ea5 5796eca Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:18:55 2024 +1200 Merge branch 'main' into ajm/tables commit baa6ea5 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:14:03 2024 +1200 Fixes for Namespace Commands so they work on DatabaseSchemaObject commit cfbbc8c Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 14:57:20 2024 +1200 fix CreateCollectionResolverVectorizeDisabledTest -> SKIPPED - later reverted , broke IT's <- commit c50d7fd Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 19:30:57 2024 -0700 Fixes #1245: change 3 unit tests to integration tests to speed up unit test runtime git cherry-pick 1996697 -> came from merge, not cherry picked <- commit 5796eca Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 19:08:23 2024 -0700 Refactor unit test profiles, try to speed things up (#1244) -> came from merge, not cherry picked <- commit 30c7ae0 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 18:36:41 2024 -0700 Fix accidental dependencies to shaded packages (#1243) -> merge commit, not cherry picked <- commit 18a804b Merge: 7ee94cd 35ecb00 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 18:33:51 2024 -0700 Merge branch 'main' into ajm/tables commit 7ee94cd Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 13:13:47 2024 +1200 fix CreateCollectionResolverVectorDisabledTest commit b12c484 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 12:45:23 2024 +1200 Fix for failing Collection based tests -> came from merge, not cherry picked <- commit 35ecb00 Author: YuqiDu <istimdu@gmail.com> Date: Mon Jul 8 17:32:05 2024 -0700 Bridge-Removal - miscellaneous cleanups (#1149) Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com> commit 4681ccd Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 11:52:31 2024 +1200 fix for createCollection and other commands that run against the namespace FindIntegrationTest works, waiting to find out about others
This commit fixes failing unit and integration tests. It cherry picks multiple commits from the ajm/tables branch below. -> SKIPPED - did not cherry pick the original see below <- commit 0b53fba Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:34:14 2024 -0700 Revert UT->IT cherry-picked merge commit 951a092 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:32:20 2024 -0700 Minor clean up of test contexts, javadocs commit 28c9ebb Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:21:20 2024 -0700 Minor clean up commit 9801566 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 17:09:18 2024 -0700 Fix import stmt -> merge commit - not cherry picked <- commit b14dfa2 Merge: 13678a5 a9cb436 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 16:49:10 2024 -0700 Merge branch 'main' into ajm/tables -> came from merge, not cherry picked <- commit a9cb436 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 16:47:00 2024 -0700 Update Quarkus Data API uses to 3.9.5 (from parent 3.6.x) (#1246) -> merge commit - not cherry picked <- commit 13678a5 Merge: c7eccc0 dd42485 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 12:29:49 2024 -0700 Merge branch 'main' into ajm/tables -> came from merge, not cherry picked <- commit dd42485 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Tue Jul 9 11:40:21 2024 -0700 Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) (#1248) -> came from merge, not cherry picked <- commit 15cd3f6 Author: YuqiDu <istimdu@gmail.com> Date: Tue Jul 9 10:31:03 2024 -0700 fix http port to 8181, refactor application.yaml as alphabetic order (#1247) -> came from merge, not cherry picked <- commit ce2b337 Author: YuqiDu <istimdu@gmail.com> Date: Tue Jul 9 09:19:11 2024 -0700 Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) (#1191) Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com> commit c7eccc0 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:31:31 2024 +1200 fmt fix commit 64930f5 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:28:42 2024 +1200 Unit test fixes for Namespace commands -> merge commit - not cherry picked <- commit e7a6d15 Merge: baa6ea5 5796eca Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:18:55 2024 +1200 Merge branch 'main' into ajm/tables commit baa6ea5 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 19:14:03 2024 +1200 Fixes for Namespace Commands so they work on DatabaseSchemaObject commit cfbbc8c Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 14:57:20 2024 +1200 fix CreateCollectionResolverVectorizeDisabledTest -> SKIPPED - later reverted , broke IT's <- commit c50d7fd Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 19:30:57 2024 -0700 Fixes #1245: change 3 unit tests to integration tests to speed up unit test runtime git cherry-pick 1996697 -> came from merge, not cherry picked <- commit 5796eca Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 19:08:23 2024 -0700 Refactor unit test profiles, try to speed things up (#1244) -> came from merge, not cherry picked <- commit 30c7ae0 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 18:36:41 2024 -0700 Fix accidental dependencies to shaded packages (#1243) -> merge commit, not cherry picked <- commit 18a804b Merge: 7ee94cd 35ecb00 Author: Tatu Saloranta <tatu.saloranta@datastax.com> Date: Mon Jul 8 18:33:51 2024 -0700 Merge branch 'main' into ajm/tables commit 7ee94cd Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 13:13:47 2024 +1200 fix CreateCollectionResolverVectorDisabledTest commit b12c484 Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 12:45:23 2024 +1200 Fix for failing Collection based tests -> came from merge, not cherry picked <- commit 35ecb00 Author: YuqiDu <istimdu@gmail.com> Date: Mon Jul 8 17:32:05 2024 -0700 Bridge-Removal - miscellaneous cleanups (#1149) Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com> commit 4681ccd Author: Aaron Morton <aaron.morton@datastax.com> Date: Tue Jul 9 11:52:31 2024 +1200 fix for createCollection and other commands that run against the namespace FindIntegrationTest works, waiting to find out about others
What this PR does:
Incrementally upgrades Quarkus Data API uses from 3.6.x (from Stargate parent) to 3.9.5, fixing 3 tests that would be failing. This is only half-way through to latest (3.12) but done to minimize risks from upgrade.
Which issue(s) this PR fixes:
N/A
Checklist