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.

Sign up for GitHub

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

Jump to bottom

Update Mockito to v2.10 (che6 branch) #6719

Merged
merged 2 commits into from
Oct 15, 2017
Merged

Update Mockito to v2.10 (che6 branch) #6719

merged 2 commits into from
Oct 15, 2017

Conversation

benoitf
Copy link
Contributor

@benoitf benoitf commented Oct 13, 2017

note : before merging, the versions of mockito needs to be removed from root pom.xml and moved to che-dependencies repository.

What does this PR do?

Update Mockito to v2.10

Some changes are required like

  • anySomething() --> nullable(Something.class) for many tests as in fact we provide null values while any() expect a non-null value
  • add class for VerificationMode as there are more than one method now (can't use lambdas)
  • remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
  • remove unecessary stubbing (mockito is now reporting un-needed stubs)
  • replace dependency mockito-all by mockito-core (it is no longer provided in 2.x)

What issues does this PR fix or reference?

#5326

Release Notes

N/A

Docs PR

N/A

Change-Id: Ifcddd24927a69cbbae1bd1dd97e35e900c94a5b3
Signed-off-by: Florent BENOIT [email protected]

@benoitf benoitf added kind/enhancement A feature request - must adhere to the feature request template. status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. target/branch Indicates that a PR will be merged into a branch other than master. labels Oct 13, 2017
@benoitf benoitf self-assigned this Oct 13, 2017
@garagatyi
Copy link

Does this PR include changes of tests from the master branch or not?

@benoitf
Copy link
Contributor Author

benoitf commented Oct 13, 2017 •
edited
Loading

@garagatyi I'm not sure to fully understand but
it contains all fixes of PR aginst master #6394 + the new fixes for new classes and also some classes have been removed so there are some fixes not applied on that branch

@codenvy-ci
Copy link

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/4132/

@benoitf benoitf mentioned this pull request Oct 13, 2017
Merged
@benoitf benoitf force-pushed the update-mockito-spi branch from 773e1e0 to 5e4ff21 Compare October 13, 2017 14:20
@codenvy-ci
Copy link

Build # 4148 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/4148/ to view the results.

@benoitf benoitf force-pushed the update-mockito-spi branch from 5e4ff21 to d79b9ed Compare October 14, 2017 13:21
@benoitf benoitf requested a review from ashumilova as a code owner October 14, 2017 13:21
@codenvy-ci
Copy link

Build # 4152 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/4152/ to view the results.

@benoitf
Move to mockito 2.10
70e3834 
Some changes are required like
 - anyString() --> nullable(String.class) for many tests as in fact we provide null values
 - add class for VerificationMode as there are more than one method now (can't use lambdas)
 - remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
 - remove unecessary stubbing (mockito is now reporting un-needed stubs)

Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <[email protected]>
@benoitf
commit to remove for merging : it should go in che-dependencies
acbdad1 
Change-Id: Ia325627b326b0b101d5ceb6e689e20d4c99055fb
Signed-off-by: Florent BENOIT <[email protected]>
@benoitf benoitf force-pushed the update-mockito-spi branch from d79b9ed to acbdad1 Compare October 15, 2017 08:45
@codenvy-ci
Copy link

Build # 4158 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/4158/ to view the results.

@skabashnyuk skabashnyuk merged commit acbdad1 into che6 Oct 15, 2017
@benoitf benoitf deleted the update-mockito-spi branch October 15, 2017 12:35
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Oct 15, 2017
@skabashnyuk skabashnyuk added this to the 6.0.0-M1 milestone Oct 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garagatyi garagatyi garagatyi approved these changes

@riuvshin riuvshin riuvshin approved these changes

@skabashnyuk skabashnyuk skabashnyuk approved these changes

@evidolob evidolob Awaiting requested review from evidolob

@tolusha tolusha Awaiting requested review from tolusha

@vparfonov vparfonov Awaiting requested review from vparfonov

@ashumilova ashumilova Awaiting requested review from ashumilova

Assignees

@benoitf benoitf

Labels
kind/enhancement A feature request - must adhere to the feature request template. target/branch Indicates that a PR will be merged into a branch other than master.
Projects
None yet
Milestone
6.0.0-M1
Development

Successfully merging this pull request may close these issues.
5 participants
@benoitf @garagatyi @codenvy-ci @skabashnyuk @riuvshin