chore: Migrate Junit 4 to Junit 5 for showcase #2757
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
gcf-owl-bot
bot
removed
the
owlbot:run
…add unit-vintage-engine.
lqiu96
reviewed
May 9, 2024
...e/gapic-showcase/src/test/java/com/google/showcase/v1beta1/ComplianceClientHttpJsonTest.java
Outdated
Show resolved
Hide resolved
lqiu96
reviewed
May 9, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java
Outdated
Show resolved
Hide resolved
lqiu96
reviewed
May 9, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java
Outdated
Show resolved
Hide resolved
product-auto-label
bot
added
size: l
lqiu96
reviewed
May 10, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITApiVersionHeaders.java
Outdated
Show resolved
Hide resolved
lqiu96
reviewed
May 10, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java
Show resolved
Hide resolved
lqiu96
reviewed
May 10, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITHttpAnnotation.java
Outdated
Show resolved
Hide resolved
lqiu96
reviewed
May 10, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java
Show resolved
Hide resolved
lqiu96
reviewed
May 10, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/update.sh
Outdated
Show resolved
Hide resolved
lqiu96
approved these changes
May 10, 2024
|
Since Min is OOO, I will take a look a final few things for this issue and merge if everything else looks fine. |
blakeli0
reviewed
May 17, 2024
Looks like the ITs aren't actually running. |
|
I see it is running the tests now: |
lqiu96
reviewed
May 17, 2024
Comment on lines
+57
to
+61
| <groupId>org.junit</groupId> | ||
| <artifactId>junit-bom</artifactId> | ||
| <version>5.10.2</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> |
There was a problem hiding this comment.
As this doesn't inherit from shared-deps or pom-parent, we declare the version here.
JoeWang1127
reviewed
May 17, 2024
showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITServerSideStreaming.java
Outdated
Show resolved
Hide resolved
JoeWang1127
approved these changes
May 17, 2024
|
|
blakeli0
reviewed
May 17, 2024
| @@ -116,6 +117,15 @@ | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
| <artifactId>maven-failsafe-plugin</artifactId> | |||
| <!-- Shared-Configs defines JUnit Provider 4.7 as default: https://github.com/googleapis/java-shared-config/blob/465bb399aef9aa8383f11c23f10a97df49c1d057/java-shared-config/pom.xml#L86-L92 --> | |||
| <!-- Override it here for showcase only as other libraries may still be reliant on JUnit4 --> | |||
| <dependencies> | |||
There was a problem hiding this comment.
Do we know why the integration tests would not run without this change?
There was a problem hiding this comment.
I believe it's due the failsafe using junit-provider 4.7 (which works for junit 4.7+) as the selected provider instead of junit-platform: https://maven.apache.org/surefire/maven-failsafe-plugin/examples/junit-platform.html#provider-selection
blakeli0
approved these changes
May 17, 2024
lqiu96
added a commit
that referenced
this pull request
May 22, 2024
fixes #2728, attempt to remove Junit 4 support after migration. Other than POM dependency migrate, changes include: - package name changes - Junit 5 syntax upgrades, e.g. `@Before` --> `@BeforeEach`, Replace assertion methods - remove public modifier on tests and test classes. - Refactor JUnit 4 TemporaryFolder `@Rule` in [ITGdch.java](https://github.com/googleapis/sdk-platform-java/pull/2757/files#diff-6ae7755a0b038e1a2febae2d27e36c762f6751b8c7db577421667069399884b4) to JUnit 5 `@TempDir` - Replace `@Test(timeout = 15000L)` in [ITClientShutdown.java](https://github.com/googleapis/sdk-platform-java/pull/2757/files#diff-70d1df57471178a7a63302f82e4a4855ffbbd642ea67d92d501bd1f7008957ca) with `@Timeout(15)` - Update `@RunWith(Parameterized.class)` test in [ITHttpAnnotation.java](https://github.com/googleapis/sdk-platform-java/pull/2757/files#diff-03d420650ecc9fe78ad4887761043c4fdceaa978f464ce30cfc4ed5f8be9b64d) to `@ParameterizedTest` with `@MethodSource("data")` ~~Note: #2737 creates a new test class with JUnit4 syntax. Depending on merging order, I will either update in this pr, or #2737.~~ Updated. Due to truth library depending on junit 4 ([see issue](google/truth#333)), junit 4 cannot be completely removed, or will encounter `java.lang.ClassNotFoundException: org.junit.runner.notification.RunListener` running tests with maven surefire. To keep things cleaner, excluding the implicitly junit brought in from truth and `junit-vintage-engine`. We could also do the reverse, and make a comment if that's prefered. --------- Co-authored-by: Burke Davison <[email protected]> Co-authored-by: Lawrence Qiu <[email protected]>
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.
fixes #2728, attempt to remove Junit 4 support after migration.
Other than POM dependency migrate, changes include:
@Before-->@BeforeEach, Replace assertion methods@Rulein ITGdch.java to JUnit 5@TempDir@Test(timeout = 15000L)in ITClientShutdown.java with@Timeout(15)@RunWith(Parameterized.class)test in ITHttpAnnotation.java to@ParameterizedTestwith@MethodSource("data")Note: #2737 creates a new test class with JUnit4 syntax. Depending on merging order, I will either update in this pr, or #2737.Updated.Due to truth library depending on junit 4 (see issue), junit 4 cannot be completely removed, or will encounter
java.lang.ClassNotFoundException: org.junit.runner.notification.RunListenerrunning tests with maven surefire. To keep things cleaner, excluding the implicitly junit brought in from truth andjunit-vintage-engine. We could also do the reverse, and make a comment if that's prefered.