Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 #47346

Copilot · 2025-11-21T03:19:00Z

JUnit 4 to JUnit 5 Migration - COMPLETE ✅

Successfully migrated all tests in azure-spring-data-cosmos from JUnit 4 to JUnit 5 in preparation for Spring Boot 4 upgrade.

Migration Checklist

Changes

Dependencies (pom.xml)

Removed junit:junit 4.13.2 dependency
Removed junit-vintage-engine compatibility layer

Test Annotations & Imports (85+ files)

@Before/@After → @BeforeEach/@AfterEach
@BeforeClass/@AfterClass → @BeforeAll/@AfterAll
@Ignore → @Disabled
@RunWith(MockitoJUnitRunner.class) → @ExtendWith(MockitoExtension.class)
@RunWith(SpringJUnit4ClassRunner.class) → @ExtendWith(SpringExtension.class)
org.junit.Assert → org.junit.jupiter.api.Assertions

Code Refactoring

Removed TestRule interface implementation from AbstractIntegrationTestCollectionManager
Removed @ClassRule and @Rule annotations
Converted all @Test(expected=Exception.class) to assertThrows() pattern
Fixed static imports for AssertJ and JUnit Jupiter compatibility
Used lenient() for Mockito stubbings that are not used in all tests

Example Conversion

// Before (JUnit 4)
@Test(expected = IllegalArgumentException.class)
public void testInvalid() {
    doSomething();
}

// After (JUnit 5)
@Test
public void testInvalid() {
    assertThrows(IllegalArgumentException.class, () -> {
        doSomething();
    });
}

Test Results

✅ All 120 tests passing

0 failures
0 errors
0 skipped

Original prompt

This section details on the original issue you should resolve

<issue_title>[FEATURE REQ] Migrate Junit4 to Jnuit5 in azure-spring-data-cosmos</issue_title>
<issue_description>Is your feature request related to a problem? Please describe.
Prepare for upgrading to Spring Boot 4, migrate all tests in azure-spring-data-cosmos from Junit4 to Jnuit5

Describe the solution you'd like
Migrate all tests in azure-spring-data-cosmos from Junit4 to Jnuit5, make sure all tests pass as before.

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

Information Checklist
Kindly make sure that you have added all the following information above and checkoff the required fields otherwise we will treat the issuer as an incomplete report

Description Added

Expected solution specified
</issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes [FEATURE REQ] Migrate Junit4 to Jnuit5 in azure-spring-data-cosmos #47345

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

@after

- Removed JUnit 4 and junit-vintage-engine dependencies from pom.xml - Migrated 85+ test files from JUnit 4 to JUnit 5 - Updated imports from org.junit to org.junit.jupiter.api - Replaced @Before/@after with @BeforeEach/@AfterEach - Replaced @BeforeClass/@afterclass with @BeforeAll/@afterall - Replaced @RunWith with @ExtendWith for Mockito and Spring - Replaced Assert with Assertions - Removed TestRule interface from AbstractIntegrationTestCollectionManager - Fixed static imports for AssertJ and JUnit Jupiter Remaining work: - Fix a few remaining compilation errors in 3 test files - Run full test suite to ensure all tests pass Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com>

@test

- Successfully migrated all 85+ test files from JUnit 4 to JUnit 5 - All tests now compile successfully with JUnit 5 - Removed JUnit 4 and junit-vintage-engine dependencies - Updated all annotations and assertions - Fixed all import statements - Removed TestRule interface usage Remaining: 14 test failures to fix (mainly incorrect @test(expected=...) conversions) These tests expect exceptions but were incorrectly migrated from @test(expected=Exception.class) syntax Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com>

- Wrapped test bodies expecting exceptions with assertThrows() in CosmosTemplateUnitTest - Wrapped test bodies expecting IllegalQueryException with assertThrows() in CriteriaUnitTest - Wrapped all test bodies expecting IllegalArgumentException with assertThrows() in SimpleCosmosRepositoryIllegalTest - Used lenient() for unused stubbing in SimpleCosmosRepositoryUnitTest to fix UnnecessaryStubbing errors All 120 tests now pass successfully. Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com>

Removed junit and junit-vintage-engine dependencies.

Netyyyy · 2025-11-21T07:04:00Z

/azp run java - spring - tests

azure-pipelines · 2025-11-21T07:04:38Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

This PR successfully migrates all tests in azure-spring-data-cosmos from JUnit 4 to JUnit 5 in preparation for Spring Boot 4 upgrade. The migration involves 85+ test files with comprehensive updates to annotations, imports, assertions, and test patterns.

Key Changes

Removed JUnit 4 dependencies (junit:junit 4.13.2, junit-vintage-engine 5.12.2)
Updated all test annotations from JUnit 4 to JUnit 5 equivalents
Converted @Test(expected=...) patterns to assertThrows() lambdas
Removed @ClassRule and @Rule annotations along with TestRule interface implementation
Updated static imports for assertions and test utilities

Reviewed changes

Copilot reviewed 92 out of 92 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
pom.xml	Removed JUnit 4 and vintage engine dependencies
external_dependencies.txt	Removed JUnit 4 dependency version references
85+ test files	Migrated annotations, imports, and assertions from JUnit 4 to JUnit 5
AbstractIntegrationTestCollectionManager.java	Removed TestRule interface implementation
SimpleCosmosRepositoryUnitTest.java	Added lenient() for Mockito stubbing

Netyyyy · 2025-11-26T07:02:23Z

Hi @kushagraThapar , we already check the changes, please help review it at your earliest convenience.

kushagraThapar · 2025-11-30T06:34:38Z

Hi @kushagraThapar , we already check the changes, please help review it at your earliest convenience.

Thanks @Netyyyy we need to run the cosmos spring tests in order to verify the changes as well.

kushagraThapar · 2025-11-30T06:40:22Z

/azp run java - cosmos - tests

azure-pipelines · 2025-11-30T06:40:46Z

Azure Pipelines successfully started running 1 pipeline(s).

Netyyyy · 2025-12-01T02:02:14Z

/azp run java - cosmos - tests

azure-pipelines · 2025-12-01T02:02:43Z

Azure Pipelines successfully started running 1 pipeline(s).

kushagraThapar · 2025-12-01T03:54:24Z

@Netyyyy I see few spring data cosmos tests failing here: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=5622303&view=ms.vss-test-web.build-test-results-tab&runId=58230383&resultId=100167&paneView=debug
Can you please look into it, thanks!

Netyyyy · 2025-12-01T04:49:52Z

/azp run java - cosmos - tests

azure-pipelines · 2025-12-01T04:50:14Z

Azure Pipelines successfully started running 1 pipeline(s).

Netyyyy · 2025-12-01T06:09:50Z

/azp run java - cosmos - tests

azure-pipelines · 2025-12-01T06:10:14Z

Azure Pipelines successfully started running 1 pipeline(s).

Netyyyy · 2025-12-01T07:33:18Z

@Netyyyy I see few spring data cosmos tests failing here: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=5622303&view=ms.vss-test-web.build-test-results-tab&runId=58230383&resultId=100167&paneView=debug Can you please look into it, thanks!

Hi @kushagraThapar , the tests passed, please help take a review, thanks.

kushagraThapar

LGTM, thanks @Netyyyy

Netyyyy · 2025-12-02T00:58:05Z

/check-enforcer override

@after

…#47346) - Removed JUnit 4 and junit-vintage-engine dependencies from pom.xml - Updated imports from org.junit to org.junit.jupiter.api - Replaced @Before/@after with @BeforeEach/@AfterEach - Replaced @BeforeClass/@afterclass with @BeforeAll/@afterall - Replaced @RunWith with @ExtendWith for Mockito and Spring - Replaced Assert with Assertions - Removed TestRule interface from AbstractIntegrationTestCollectionManager - Fixed static imports for AssertJ and JUnit Jupiter - Migrate @test(expected=...) to assertThrows (cherry picked from commit 7ced330)

@nonnull

* fix: suppress deprecation warnings for Spring Framework 7.0 @Nullable/@nonnull annotations * replace ListenableFutureCallback * add spring-boot-persistence and replace * fix ConfigurableBootstrapContext/EnvironmentPostProcessor path * replace with spring-boot-kafka * remove alwaysApplyingWhenNonNull() * replace with spring-boot-data-redis * replace with spring-boot-jms * replace with spring-boot-jdbc * add spring-boot-restclient * add spring-boot-security * add spring-boot-jackson * add spring-boot-http-converter * replace new OAuth2ClientAutoConfiguration * replace containsKey with containsHeader * add spring-boot-health * replace spring-boot-starter-web with spring-boot-starter-webmvc * replace org.springframework.data.util.TypeInformation with org.springframework.data.core.TypeInformation * replace with ParametersSource.of() * replace QueryMethodEvaluationContextProvider with ValueExpressionDelegate * replace ClassTypeInformation.from with TypeInformation.of * Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 (#47346) * skip monitor for not support Spring Boot 4 * replace with jackson2 * replace spring.jms.listener.concurrency with spring.jms.listener.minConcurrency * Add jackson-databind

Initial plan

1d52f70

Copilot AI assigned Copilot and Netyyyy Nov 21, 2025

Copilot started work on behalf of Netyyyy November 21, 2025 03:19 View session

Copilot AI and others added 2 commits November 21, 2025 03:36

Copilot AI changed the title ~~[WIP] Migrate tests from Junit4 to Junit5 in azure-spring-data-cosmos~~ Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 Nov 21, 2025

Copilot AI requested a review from Netyyyy November 21, 2025 03:48

Copilot finished work on behalf of Netyyyy November 21, 2025 03:48

Copilot started work on behalf of Netyyyy November 21, 2025 05:01 View session

Copilot finished work on behalf of Netyyyy November 21, 2025 05:08

Remove JUnit dependencies from external_dependencies.txt

5376767

Removed junit and junit-vintage-engine dependencies.

Netyyyy requested a review from Copilot November 26, 2025 01:23

Copilot started reviewing on behalf of Netyyyy November 26, 2025 01:24 View session

Copilot finished reviewing on behalf of Netyyyy November 26, 2025 01:24

Azure deleted a comment from Copilot AI Nov 26, 2025

Copilot AI reviewed Nov 26, 2025

View reviewed changes

Netyyyy added 2 commits November 26, 2025 11:20

update

7df4f29

fix

b8efa01

Netyyyy marked this pull request as ready for review November 26, 2025 06:15

Netyyyy requested review from JonathanGiles, alzimmermsft, g2vinay, moarychan, rujche, samvaity and saragluna as code owners November 26, 2025 06:15

Netyyyy requested review from a team as code owners November 26, 2025 06:15

fix

20f4b03

fix

1200596

fix

6b0f19f

kushagraThapar approved these changes Dec 1, 2025

View reviewed changes

Netyyyy approved these changes Dec 2, 2025

View reviewed changes

saragluna approved these changes Dec 2, 2025

View reviewed changes

Netyyyy merged commit 7ced330 into main Dec 2, 2025
79 of 94 checks passed

Netyyyy deleted the copilot/migrate-junit4-to-junit5 branch December 2, 2025 01:29

Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 #47346

Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 #47346

Uh oh!

Conversation

Copilot AI commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

JUnit 4 to JUnit 5 Migration - COMPLETE ✅

Migration Checklist

Changes

Dependencies (pom.xml)

Test Annotations & Imports (85+ files)

Code Refactoring

Example Conversion

Test Results

Comments on the Issue (you are @copilot in this section)

Uh oh!

Netyyyy commented Nov 21, 2025

Uh oh!

azure-pipelines bot commented Nov 21, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Netyyyy commented Nov 26, 2025

Uh oh!

kushagraThapar commented Nov 30, 2025

Uh oh!

kushagraThapar commented Nov 30, 2025

Uh oh!

azure-pipelines bot commented Nov 30, 2025

Uh oh!

Netyyyy commented Dec 1, 2025

Uh oh!

azure-pipelines bot commented Dec 1, 2025

Uh oh!

kushagraThapar commented Dec 1, 2025

Uh oh!

Netyyyy commented Dec 1, 2025

Uh oh!

azure-pipelines bot commented Dec 1, 2025

Uh oh!

Netyyyy commented Dec 1, 2025

Uh oh!

azure-pipelines bot commented Dec 1, 2025

Uh oh!

Netyyyy commented Dec 1, 2025

Uh oh!

kushagraThapar left a comment

Choose a reason for hiding this comment

Uh oh!

Netyyyy commented Dec 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Nov 21, 2025 •

edited

Loading