Fixes #3331 : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers #3335

dev-jonghoonpark · 2024-05-03T10:33:05Z

related issue: #3331

Motivation:

On AdditionalMatchers.and() and or() swap matcher order #3331, we found that AdditionalMatchers.and() and or() swap matcher order

Modification:

Changed the assignment order of popMatcher() results.

Result:

Now, AdditionalMatchers.and() and or() not swap matcher order
Close AdditionalMatchers.and() and or() swap matcher order #3331

Checklist

Read the contributing guide
PR should be motivated, i.e. what does it fix, why, and if relevant how
If possible / relevant include an example in the description, that could help all readers
including project members to get a better picture of the change
Avoid other runtime dependencies
Meaningful commit history ; intention is important please rebase your commit history so that each
commit is meaningful and help the people that will explore a change in 2 years
The pull request follows coding style
Mention Fixes #<issue number> in the description if relevant
At least one commit should mention Fixes #<issue number> if relevant

src/test/java/org/mockito/internal/progress/ArgumentMatcherStorageImplTest.java

dev-jonghoonpark · 2024-05-09T04:31:57Z

@TimvdLippe

I midified the code based on your feedback, can you check it?

The test code works like this

and

If the test is sequential, it will be filtered out byany(String.class), so doSomeThing() will not return 1.
If it's not sequential, the test will fail with an error in argThat(String::isEmpty). (because the input is not a String)

or

If the test is sequential, any(Integer.class) will pass, so doSomeThing() will return 1.
If it is not sequential, the test will fail with an error in argThat(String::isEmpty). (because the input is not a String)

TimvdLippe

This looks great, thank you so much!

codecov-commenter · 2024-05-11T08:40:00Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.35%. Comparing base (fb9ff6d) to head (65a76c0).
Report is 5 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #3335      +/-   ##
============================================
+ Coverage     85.33%   85.35%   +0.02%     
- Complexity     2924     2926       +2     
============================================
  Files           336      336              
  Lines          8907     8907              
  Branches       1109     1109              
============================================
+ Hits           7601     7603       +2     
  Misses         1013     1013              
+ Partials        293      291       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

dev-jonghoonpark · 2024-05-11T08:45:51Z

I'll check why the test is failing and fix it. ; )

TimvdLippe · 2024-05-11T09:03:36Z

You can run ./gradlew spotlessApply to automatically fix it for you.

…rder

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) | test | minor | `5.11.0` -> `5.12.0` | | [org.geotools:gt-geojson-core](https://github.com/geotools/geotools) | compile | minor | `31.0` -> `31.1` | | [org.geotools:gt-epsg-extension](https://github.com/geotools/geotools) | compile | minor | `31.0` -> `31.1` | | [org.geotools:gt-referencing](https://github.com/geotools/geotools) | compile | minor | `31.0` -> `31.1` | | [org.geotools:gt-epsg-hsql](https://github.com/geotools/geotools) | compile | minor | `31.0` -> `31.1` | | [org.springframework.boot:spring-boot-dependencies](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | parent | minor | `3.2.5` -> `3.3.0` | --- ### Release Notes <details> <summary>mockito/mockito (org.mockito:mockito-junit-jupiter)</summary> ### [`v5.12.0`](https://github.com/mockito/mockito/releases/tag/v5.12.0) [Compare Source](mockito/mockito@v5.11.0...v5.12.0) <sup><sup>*Changelog generated by [Shipkit Changelog Gradle Plugin](https://github.com/shipkit/shipkit-changelog)*</sup></sup> ##### 5.12.0 - 2024-05-11 - [25 commit(s)](mockito/mockito@v5.11.0...v5.12.0) by Piotr Przybylak, Stefano Cordio, Tim van der Lippe, dependabot\[bot], jonghoonpark - Bump com.gradle.enterprise from 3.17.2 to 3.17.3 [(#3341)](mockito/mockito#3341) - Bump org.jetbrains.kotlin:kotlin-stdlib from 1.9.23 to 1.9.24 [(#3339)](mockito/mockito#3339) - Bump versions.bytebuddy from 1.14.14 to 1.14.15 [(#3338)](mockito/mockito#3338) - Bump org.shipkit:shipkit-auto-version from 2.0.6 to 2.0.7 [(#3337)](mockito/mockito#3337) - Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.9.23 to 1.9.24 [(#3336)](mockito/mockito#3336) - Fixes [#3331](mockito/mockito#3331) : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers [(#3335)](mockito/mockito#3335) - AdditionalMatchers.and() and or() swap matcher order [(#3331)](mockito/mockito#3331) - Bump gradle/wrapper-validation-action from 3.3.1 to 3.3.2 [(#3327)](mockito/mockito#3327) - Bump versions.bytebuddy from 1.14.13 to 1.14.14 [(#3324)](mockito/mockito#3324) - Bump org.shipkit:shipkit-auto-version from 2.0.5 to 2.0.6 [(#3322)](mockito/mockito#3322) - Bump gradle/wrapper-validation-action from 3.3.0 to 3.3.1 [(#3320)](mockito/mockito#3320) - Bump com.gradle.enterprise from 3.17 to 3.17.2 [(#3318)](mockito/mockito#33...

TimvdLippe requested changes May 8, 2024

View reviewed changes

src/test/java/org/mockito/internal/progress/ArgumentMatcherStorageImplTest.java Outdated Show resolved Hide resolved

dev-jonghoonpark force-pushed the main branch from e4a8b22 to c8397d5 Compare May 9, 2024 04:24

dev-jonghoonpark force-pushed the main branch from c8397d5 to 757a415 Compare May 9, 2024 04:45

TimvdLippe approved these changes May 11, 2024

View reviewed changes

Fixes mockito#3331 : AdditionalMatchers.and() and or() swap matcher o…

65a76c0

…rder

dev-jonghoonpark force-pushed the main branch from 757a415 to 65a76c0 Compare May 11, 2024 09:18

TimvdLippe merged commit 12cef84 into mockito:main May 11, 2024
18 checks passed

wayneguow mentioned this pull request Jun 23, 2024

[SPARK-48691][BUILD] Upgrade scalatest related dependencies to the 3.2.19 series apache/spark#47065

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #3331 : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers #3335

Fixes #3331 : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers #3335

dev-jonghoonpark commented May 3, 2024

dev-jonghoonpark commented May 9, 2024

TimvdLippe left a comment

codecov-commenter commented May 11, 2024 •

edited

Loading

dev-jonghoonpark commented May 11, 2024

TimvdLippe commented May 11, 2024

Fixes #3331 : Fix AdditionalMatchers.and() and AdditionalMatchers.or() not to swap the order of matchers #3335

Fixes #3331 : Fix AdditionalMatchers.and() and AdditionalMatchers.or() not to swap the order of matchers #3335

Conversation

dev-jonghoonpark commented May 3, 2024

Motivation:

Modification:

Result:

Checklist

dev-jonghoonpark commented May 9, 2024

and

or

TimvdLippe left a comment

Choose a reason for hiding this comment

codecov-commenter commented May 11, 2024 • edited Loading

Codecov Report

dev-jonghoonpark commented May 11, 2024

TimvdLippe commented May 11, 2024

Fixes #3331 : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers #3335

Fixes #3331 : Fix `AdditionalMatchers.and()` and `AdditionalMatchers.or()` not to swap the order of matchers #3335

codecov-commenter commented May 11, 2024 •

edited

Loading