Refactor PostgreSQLContainer initialization in tests

[oneonestar]

Description

Refactor PostgreSQLContainer initialization in tests

Additional context and related issues

• Centralize creation of PostgreSQLContainer
• Add Wait.forListeningPort() to PostgreSQLContainer. This prevent flaky connection issue when testing on Mac + Rancher Desktop. (Ref: Running Testcontainers with Rancher Desktop and Apple Silicon fails rancher-sandbox/rancher-desktop#2609)

Release notes

(X) This is not user-visible or is docs only, and no release notes are required.

Summary by Sourcery

Centralize PostgreSQLContainer initialization in tests and add a listening-port wait strategy to improve startup reliability

Enhancements:

• Introduce TestcontainersUtils.createPostgresqlContainer utility that applies both port and log-message wait strategies

Tests:

• Refactor all test classes to use createPostgresqlContainer instead of direct PostgreSQLContainer instantiation

[sourcery-ai]

Reviewer's Guide

Centralizes PostgreSQLContainer setup in tests by introducing a utility factory with robust startup waits, and refactors all test classes to use this shared initialization, improving stability and reducing duplication.

File-Level Changes

Change	Details	Files
Introduce a centralized PostgreSQLContainer factory with enhanced wait strategy	Add TestcontainersUtils.createPostgresqlContainer() method Configure WaitAllStrategy combining forListeningPort() and LogMessageWaitStrategy Standardize on postgres:17 image and a 60s startup timeout	gateway-ha/src/test/java/io/trino/gateway/ha/util/TestcontainersUtils.java
Refactor test classes to leverage the new container factory	Replace new PostgreSQLContainer("postgres:..." ) with createPostgresqlContainer() Remove inline waitingFor(...) calls and database version overrides Add static imports for createPostgresqlContainer()	gateway-ha/src/test/java/io/trino/gateway/ha/security/TestOIDC.java gateway-ha/src/test/java/io/trino/gateway/ha/persistence/TestDatabaseMigrationsPostgreSql.java gateway-ha/src/test/java/io/trino/gateway/ha/router/TestQueryHistoryManagerPostgresql.java gateway-ha/src/test/java/io/trino/gateway/ha/router/TestExternalUrlQueryHistoryPostgreSql.java gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaMultipleBackend.java gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaSingleBackend.java gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaWithRoutingRulesSingleBackend.java gateway-ha/src/test/java/io/trino/gateway/ha/TestNoXForwarded.java gateway-ha/src/test/java/io/trino/gateway/ha/TestTrinoResource.java gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingAPI.java gateway-ha/src/test/java/io/trino/gateway/ha/security/TestAuthorization.java gateway-ha/src/test/java/io/trino/gateway/proxyserver/TestProxyRequestHandler.java

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey there - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}