Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added configurable interaction matching. #1308

Closed
wants to merge 4 commits into from
Closed

Added configurable interaction matching. #1308

wants to merge 4 commits into from

Conversation

CamilYed
Copy link

@CamilYed CamilYed commented Apr 7, 2021

Added 'last match algorithm' to determine the defined return value of a
method. This enables easy overriding of default return values. As
requested in issue #26, #251, #321 and #962.

Added 'last match algorithm' to determine the defined return value of a
method. This enables easy overriding of default return values. As
requested in issue #26, #251, #321 and #962.

Based on:
#1219
@codecov
Copy link

codecov bot commented Apr 7, 2021

Codecov Report

Merging #1308 (ff38f9b) into master (6b9d989) will increase coverage by 0.01%.
The diff coverage is 90.90%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1308      +/-   ##
============================================
+ Coverage     79.14%   79.16%   +0.01%     
- Complexity     3922     3927       +5     
============================================
  Files           409      409              
  Lines         12235    12253      +18     
  Branches       1610     1615       +5     
============================================
+ Hits           9684     9700      +16     
- Misses         1970     1971       +1     
- Partials        581      582       +1     
Impacted Files Coverage Δ Complexity Δ
...pock-core/src/main/java/spock/mock/MockingApi.java 2.88% <ø> (ø) 2.00 <0.00> (ø)
...ckframework/spring/mock/DelegatingInterceptor.java 53.84% <0.00%> (-1.42%) 6.00 <0.00> (ø)
.../spockframework/mock/runtime/InteractionScope.java 98.07% <90.00%> (-1.93%) 19.00 <5.00> (+5.00) ⬇️
...kframework/mock/runtime/GroovyMockInterceptor.java 76.47% <100.00%> (+0.71%) 7.00 <0.00> (ø)
...ockframework/mock/runtime/GroovyMockMetaClass.java 86.66% <100.00%> (+0.30%) 21.00 <0.00> (ø)
...ockframework/mock/runtime/JavaMockInterceptor.java 100.00% <100.00%> (ø) 15.00 <0.00> (ø)
...spockframework/mock/runtime/MockConfiguration.java 100.00% <100.00%> (ø) 20.00 <1.00> (+1.00)
...va/org/spockframework/mock/runtime/MockObject.java 83.78% <100.00%> (+0.92%) 23.00 <2.00> (+1.00)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b9d989...ff38f9b. Read the comment docs.

Kamil Jedrzejuk added 2 commits April 7, 2021 23:10
Added 'last match algorithm' to determine the defined return value of a
method. This enables easy overriding of default return values. As
requested in issue #26, #251, #321 and #962.
# Conflicts:
#	spock-specs/src/test/groovy/org/spockframework/smoke/mock/InteractionScopeMatching.groovy
@CamilYed
Copy link
Author

Could you review my changes: @szpak ?

@leonard84
Copy link
Member

Spock 2.0 is in feature freeze at the moment

@CamilYed CamilYed closed this Apr 14, 2021
@CamilYed
Copy link
Author

Not for 2.0 now

@CamilYed CamilYed reopened this Apr 14, 2021
@CamilYed CamilYed closed this Apr 14, 2021
@leonard84
Copy link
Member

@KamilJedrzejuk you didn't have to close this PR, the Spock 2.0 release is not far off, that's why we won't merge new features. We will review it afterwards.

@CamilYed
Copy link
Author

Hi, what about this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants