test: Migrate gax unit tests to Junit 5 #2724
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 3, 2024
product-auto-label
bot
added
size: l
blakeli0
changed the title
JoeWang1127
reviewed
May 17, 2024
| import org.threeten.bp.Duration; | ||
|
|
||
| @RunWith(JUnit4.class) | ||
| public class TimeoutTest { | ||
| @ExtendWith(MockitoExtension.class) |
There was a problem hiding this comment.
Because there is a @Rule for Mockito being removed below.
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/batching/ThresholdBatcherTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/batching/ThresholdBatcherTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/batching/ThresholdBatcherTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/ApiExceptionsTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/ApiExceptionsTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/ApiExceptionsTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchedRequestIssuerTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchedRequestIssuerTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchedRequestIssuerTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchedRequestIssuerTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchingTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/BatchingTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
...a/gax/src/test/java/com/google/api/gax/rpc/internal/QuotaProjectIdHidingCredentialsTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/mtls/AbstractMtlsTransportChannelTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/mtls/MtlsProviderTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/mtls/MtlsProviderTest.java
Outdated
Show resolved
Hide resolved
JoeWang1127
reviewed
May 17, 2024
JoeWang1127
reviewed
May 17, 2024
gax-java/pom.xml
Outdated
| <version>4.13.2</version> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-core</artifactId> | ||
| <version>4.11.0</version> |
There was a problem hiding this comment.
Why not using mockito bom?
There was a problem hiding this comment.
I was not aware of a mockito bom, sounds like a good idea. Also, I think adding the bom to this pom should fine, because gax-parent is not included in the gapic-generator-java-bom, only gax-bom is. Is that correct?
There was a problem hiding this comment.
Yes, I think so.
You can verify this by running mvn -pl gapic-generator-java-bom help:effective-pom at repo root.
lqiu96
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
Show resolved
Hide resolved
lqiu96
reviewed
May 17, 2024
gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
Show resolved
Hide resolved
lqiu96
reviewed
May 17, 2024
gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcDirectStreamControllerTest.java
Outdated
Show resolved
Hide resolved
|
|
JoeWang1127
approved these changes
May 17, 2024
lqiu96
pushed a commit
that referenced
this pull request
May 22, 2024
This PR migrate all unit tests in Gax to Junit 5. Other than standard direct replacements, some tests need to be rewritten due to the following scenarios: - `@Rule` does not exist anymore and there is no direct replacement. We mostly use it to initialize a Mockito stub, replaced with `@ExtendWith(MockitoExtension.class)`. - Some tests were relying on try-catch to assert exceptions, replaced with `assertThrows`. e.g. [OperationsClientTest](https://github.com/googleapis/sdk-platform-java/pull/2724/files#diff-4530df761eff0854357165d951e1667d3810a5448ec2aa4b853a6331516cbde0) - Parameterized tests in [AbstractRetryingExecutorTest](https://github.com/googleapis/sdk-platform-java/pull/2724/files#diff-9c5f5c1d2fcef6c4164fc0171d01e7020aa7ebb7aa49615cf3743dc89c9b3d1d) There are a few environment variable tests can be re-written with Junit 5, so we don't need to configure a [profile](https://github.com/googleapis/sdk-platform-java/blob/main/gax-java/gax/pom.xml#L115-L128) for it anymore, but they are not in the scope of this PR. fixes: #1611.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR migrate all unit tests in Gax to Junit 5.
Other than standard direct replacements, some tests need to be rewritten due to the following scenarios:
@Ruledoes not exist anymore and there is no direct replacement. We mostly use it to initialize a Mockito stub, replaced with@ExtendWith(MockitoExtension.class).assertThrows. e.g. OperationsClientTestThere are a few environment variable tests can be re-written with Junit 5, so we don't need to configure a profile for it anymore, but they are not in the scope of this PR.
fixes: #1611.