Skip to content

chore: Use assertThrows in tests#4028

Merged
lqiu96 merged 7 commits intomainfrom
cleanup-test-resources
Dec 12, 2025
Merged

chore: Use assertThrows in tests#4028
lqiu96 merged 7 commits intomainfrom
cleanup-test-resources

Conversation

@lqiu96
Copy link
Member

@lqiu96 lqiu96 commented Dec 12, 2025

No description provided.

@product-auto-label product-auto-label bot added size: l Pull request size is large. api: bigquery Issues related to the googleapis/java-bigquery API. labels Dec 12, 2025
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @lqiu96, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the quality and maintainability of the BigQuery integration test suite. The core objective was to modernize exception handling by migrating from the verbose try-catch-fail pattern to the more expressive assertThrows method. Complementary changes include standardizing assertion styles and optimizing resource management, resulting in a cleaner, more readable, and robust test codebase.

Highlights

  • Test Refactoring: Replaced numerous try-catch-fail blocks with the more modern and concise assertThrows method for validating expected exceptions across various BigQuery operations within the integration tests.
  • Assertion Style Consistency: Standardized assertion patterns, such as updating assertTrue(condition.equals(value)) to assertEquals(value, condition) and assertThat().isNotEqualTo() to assertNotEquals(), for improved readability and consistency.
  • Resource Management and Code Simplification: Introduced try-with-resources for TableDataWriteChannel in relevant tests and streamlined boolean assertions and return statements to make the test code more efficient and easier to understand.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request primarily refactors tests to use assertThrows instead of try-catch-fail blocks, which is a great improvement for test readability and conciseness. The changes are mostly correct and well-implemented. I've found a few minor inconsistencies: some assertThrows conversions dropped the failure message, and there's a mix of assertion styles (JUnit vs. Truth) being introduced. I've added specific comments with suggestions to address these points for better consistency. Additionally, the PR includes other nice cleanups like removing unnecessary local variables and using try-with-resources.

@lqiu96 lqiu96 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 12, 2025
@lqiu96 lqiu96 marked this pull request as ready for review December 12, 2025 21:25
@lqiu96 lqiu96 requested a review from a team December 12, 2025 21:25
@lqiu96 lqiu96 requested a review from a team as a code owner December 12, 2025 21:25
@lqiu96 lqiu96 requested review from mpeddada1 and tswast and removed request for tswast December 12, 2025 21:25
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 12, 2025
Comment on lines +2827 to +2830
BigQueryError error = exception.getError();
assertNotNull(error);
assertEquals("notFound", error.getReason());
assertNotNull(error.getMessage());
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps we could also simplify the remaining assert statements further by using the Truth.assertThat?
Example: assertThat(exception).hasMessageThat().contains("...");

@lqiu96 lqiu96 merged commit 3673310 into main Dec 12, 2025
24 checks passed
@lqiu96 lqiu96 deleted the cleanup-test-resources branch December 12, 2025 22:27
diegomarquezp pushed a commit that referenced this pull request Dec 15, 2025
* chore: Cleanup initialized resources

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings

* chore: Allow for floating point inaccuracies

* chore: Add otel delete operation

* chore: Clean up rest of the IT test file

* chore: Add GCA feedback
diegomarquezp added a commit that referenced this pull request Dec 15, 2025
* chore: sync with last release from main branch

* feat: Introduce DataFormatOptions to configure the output of BigQuery data types (#4010)

* feat: Create DataFormatOptions in BigQuery

* feat: Add Builder class for DataFormatOptions

* fix: Update existing references of useInt64Timestamp to use DataFormatOption's variant

* chore: Fix lint issues

* chore: Address PR feedback

* chore: Add tests for useInt64Timestamp behavior

* chore: Address failing tests and GCA

* chore: Remove unused fromPb method

* feat: Add timestamp_precision to Field (#4014)

* feat: Add timestamp_precision to Field

* Apply suggestion from @gemini-code-assist[bot]

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* chore: Address GCA PR feedback

* chore: Fix typo

* chore: Remove default value

* chore: Address PR feedback

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* chore: Use custom timestamp validator for ISO8601 timestamps with more than nanosecond precision (#4017)

* chore: Use custom timestamp validator for ISO8601 timestamps with more than nanosecond precision

* chore: Rename helper method to validateTimestamp

* chore: Address GCA comments

* chore: Address last GCA comment

* chore: Update to use assert helper method

* test: Clean up resources created in ITs (#4024)

* chore: Cleanup initialized resources

* chore: Delete created dataset

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings (#4026)

* chore: Cleanup initialized resources

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings

* chore: Allow for floating point inaccuracies

* chore: Add otel delete operation

* deps: update actions/upload-artifact action to v6 (#4027)

Co-authored-by: Blake Li <blakeli@google.com>

* chore: Use assertThrows in tests (#4028)

* chore: Cleanup initialized resources

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings

* chore: Allow for floating point inaccuracies

* chore: Add otel delete operation

* chore: Clean up rest of the IT test file

* chore: Add GCA feedback

* chore: Update renovate.json (#4031)

deps update from bigquerystorage was incorrectly marked as chore(deps). This would cause the upgrade not show up in the release notes and also not trigger release please.

This is because the pattern /^com.google.cloud:google-cloud-bigquery is configured in renovate.json, which matches both bigquery and bigquerystorage. However, I believe the original intention is only for bigquery update in samples, not for bigquerystorage update.

Fixing the pattern so that the String must ends with bigquery

* chore(main): release 2.57.2-SNAPSHOT (#4032)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: fix unresolved conflicts

---------

Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Blake Li <blakeli@google.com>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
blakeli0 added a commit that referenced this pull request Feb 3, 2026
* chore: add release-please config for protobuf-4.x (#4009)

* chore: add release-please config for protobuf-4.x

* Change release type from java-lts to java-yoshi

* feat: Introduce DataFormatOptions to configure the output of BigQuery data types (#4010)

* feat: Create DataFormatOptions in BigQuery

* feat: Add Builder class for DataFormatOptions

* fix: Update existing references of useInt64Timestamp to use DataFormatOption's variant

* chore: Fix lint issues

* chore: Address PR feedback

* chore: Add tests for useInt64Timestamp behavior

* chore: Address failing tests and GCA

* chore: Remove unused fromPb method

* feat: Add timestamp_precision to Field (#4014)

* feat: Add timestamp_precision to Field

* Apply suggestion from @gemini-code-assist[bot]

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* chore: Address GCA PR feedback

* chore: Fix typo

* chore: Remove default value

* chore: Address PR feedback

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* chore: Use custom timestamp validator for ISO8601 timestamps with more than nanosecond precision (#4017)

* chore: Use custom timestamp validator for ISO8601 timestamps with more than nanosecond precision

* chore: Rename helper method to validateTimestamp

* chore: Address GCA comments

* chore: Address last GCA comment

* chore: Update to use assert helper method

* chore(main): release 2.56.1-SNAPSHOT (#4001)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.54.2 (#4022)

* chore(main): release 2.57.0 (#4021)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* test: Clean up resources created in ITs (#4024)

* chore: Cleanup initialized resources

* chore: Delete created dataset

* chore: Use try-with to close stream

* chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.19.0 (#4025)

* chore(main): release 2.57.1-SNAPSHOT (#4023)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: Cleanup Intellij test warnings (#4026)

* chore: Cleanup initialized resources

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings

* chore: Allow for floating point inaccuracies

* chore: Add otel delete operation

* deps: update actions/upload-artifact action to v6 (#4027)

Co-authored-by: Blake Li <blakeli@google.com>

* chore: Use assertThrows in tests (#4028)

* chore: Cleanup initialized resources

* chore: Use try-with to close stream

* chore: Cleanup Intellij test warnings

* chore: Allow for floating point inaccuracies

* chore: Add otel delete operation

* chore: Clean up rest of the IT test file

* chore: Add GCA feedback

* chore(main): release 2.57.1 (#4029)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: Update renovate.json (#4031)

deps update from bigquerystorage was incorrectly marked as chore(deps). This would cause the upgrade not show up in the release notes and also not trigger release please.

This is because the pattern /^com.google.cloud:google-cloud-bigquery is configured in renovate.json, which matches both bigquery and bigquerystorage. However, I believe the original intention is only for bigquery update in samples, not for bigquerystorage update.

Fixing the pattern so that the String must ends with bigquery

* chore(main): release 2.57.2-SNAPSHOT (#4032)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* test: Add integration tests for picosecond support (#4030)

* test: Add integration tests for picosecond support

* chore: Add a micro -> pico exact timestamp test case

* chore: Add additional test cases

* chore: Fix test cases with 'Z'

* chore: Test if first query has an impact

* chore: Remove flaky test for now

* chore: Remove testing comment

* fix: Job.isDone() uses Job.Status.State if available (#4039)

* chore: remove build badges (#4046)

b/468377909

* chore: handled race condition in stateless query integration test (#4045)

* fix: handled race condition in stateless query integration test

The testTableResultJobIdAndQueryId test was failing intermittently on slower networks. The test strictly asserted that Job ID must be null for stateless queries.

However, the library correctly falls back to creating a Job ID if the stateless query times out. This change updates the assertion logic to accept either a valid Query ID (stateless success) or a valid Job ID (fallback success).

Fixes #4008

* refactor: use XOR assertion for conciseness

 Applied feedback from code review to use exclusive OR operator for validating JobID/QueryID mutual exclusivity.

* fix: apply race condition logic to testStatelessQueries

Applied XOR assertion logic to testStatelessQueries. Test was failing on slow networks because they did not account for JOB_CREATION_OPTIONAL falling back to job creation.

Fixes #4002

* docs: add comment explaining stateless query fallback behavior

* docs: add comment explaining stateless query fallback behavior in testTableResultJobIdAndQueryId()

* chore: Ignore unused declared junit-jupiter-engine error in dependencies check (#4048)

* chore: Ingore unused junit-jupiter-engine error in dependencies check

* chore: Update pom.xml

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* chore: Update comment format for junit-jupiter-engine

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: gracefully handle thread interruption in ConnectionImpl to preve… (#4047)

* fix: gracefully handle thread interruption in ConnectionImpl to prevent CI flakes

Fixes #3992

* fix: consolidate interrupt checks and handle raw InterruptedException as per review

* fix: remove CancelledException check per review feedback

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.73.0 (#3922)

* docs: Add specific samples for creating and query timestamps (#4051)

* docs: Add specific samples for creating and query timestamps

* chore: Fix samples checkstyle issue

* chore: Address gemini suggestions

* chore: Update expiration time for test

* chore: Migrate tests to JUnit5 (#4052)

* feat: Migrate to JUnit 5 and add parallel test execution

* feat: Migrate tests to JUnit5

* chore: Add surefire-junit-platform dep for ITs

* chore: Fix broken tests

* chore: Upgrade existing integration tests to JUnit 5 syntax and features

* chore: Upgrade ITNightlyBigQueryTest to JUnit 5 features and package-private

* chore: Make the tests package-private

* feat: migrate tests to JUnit 5 assertThrows and static imports

* chore: Remove wildcard imports

* chore: revert samples to use junit4

* chore: Address code comments

* chore: Close connection after test

---------

Co-authored-by: AbgarSim <abgar1223@gmail.com>

* chore: move Google JDBC driver code (#4050)

* test: Use unique table names in tests (#4053)

* feat: Migrate to JUnit 5 and add parallel test execution

* feat: Migrate tests to JUnit5

* chore: Add surefire-junit-platform dep for ITs

* test: Enable parallel tests for JUnit5

* chore: Fix broken tests

* chore: Upgrade existing integration tests to JUnit 5 syntax and features

* chore: Upgrade ITNightlyBigQueryTest to JUnit 5 features and package-private

* chore: Make the tests package-private

* feat: migrate tests to JUnit 5 assertThrows and static imports

* chore: Remove wildcard imports

* chore: revert samples to use junit4

* chore: Address code comments

* chore: Close connection after test

* chore: Fix flaky tests

* chore: Fix flaky tests

* chore: Fix tests

* chore: Disable cache for query stats

* chore: Add unique id to each table

* chore: Use unique test table names

* chore: Remove parallel test execution

* chore: Add comment for cache

* chore: Fix broken test

---------

Co-authored-by: AbgarSim <abgar1223@gmail.com>

* feat:Add JUnit 5 and add parallel test execution (#4058)

* chore: cleanup release-please config (#4013)

* chore: cleanup release-please config

- Remove redundant options already declared at the top level.\n- Remove bumpMinorPreMajor for repositories after the first major release.

* chore: format release-please.yml

* chore(deps): update dependency com.google.cloud:sdk-platform-java-config to v3.55.1 (#4060)

* chore(main): update CODEOWNERS with JDBC ownership (#4063)

* chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.19.1 (#4036)

* chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.20.0-rc1

* Update google-cloud-bigquerystorage-bom version

---------

Co-authored-by: Diego Marquez <diegomarquezp@google.com>

* chore: Enable exponential backoff for retries in tests (#4059)

* chore: Enable exponential backoff for retries in tests

* chore: Clone table for DML query tests

* chore: Use GCA retry settings code suggestion

* chore(jdbc): moving helper scripts & simplify dependencies (#4062)

* chore: Fix flaky testListTablesWithPartitioning test (#4068)

* chore: Fix flaky testListTablesWithPartitioning test

* chore: Fix test comment

* chore: Fix typo to partitionType

* chore(main): release 2.57.2 (#4044)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

---------

Co-authored-by: Diego Marquez <diegomarquezp@google.com>
Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Abgar Simonean <abgar1223@gmail.com>
Co-authored-by: Tomo Suzuki <suztomo@google.com>
Co-authored-by: Sivamurugan P <73530366+SivamuruganP@users.noreply.github.com>
Co-authored-by: Kirill Logachev <kirl@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: bigquery Issues related to the googleapis/java-bigquery API. size: l Pull request size is large.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants