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

Master #1599

Closed
wants to merge 85 commits into from
Closed

Master #1599

wants to merge 85 commits into from

Conversation

PiskaryovNikita
Copy link

Hey,

Thanks for the contribution, this is awesome.
As you may have read, project members have somehow an opinionated view on what and how should be
Mockito, e.g. we don't want mockito to be a feature bloat.
There may be a thorough review, with feedback -> code change loop.

Which branch :

  • On mockito 2.x, make your pull request target release/2.x
  • On next mockito version make your pull request target master

This block can be removed
_Something wrong in the template fix it here .github/PULL_REQUEST_TEMPLATE.md

check list

  • 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

TimvdLippe and others added 30 commits September 10, 2016 19:39
Update generated pom.xml with more project information
AssertJ 3 requires Java 8 and was therefore a breaking change,
but there are no other changes breaking our test suite.
Also renamed misspelled isSussessful() to isSuccessful(). Added missing new line at the end of FailureDetector.

Fixes: #653.
Fixing the typo in JUnitDetecter class name
…eIsConfusingMockitoTest which had been added already (#673)
[ci skip] After publishing from release/2.x manually updated the release notes.
mureinik and others added 27 commits February 5, 2017 21:09
* Add missing newlines at the end of source files

At the time this patch was authored, 252 (~31%) source files in the
project did not end with a newline, while 555 (~69%) did.

This patch takes the de-facto standard of having a newline at the end
of a file and applies it to all the source files in the project.

Besides improving standardization, another contributing consideration
is the fact that many editors/IDEs add newlines at the end of files.
Using such an IDE will add a newline to the edited file, adding
"noise" to the patch and confusing potential reviewers. By explicitly
adding all the missing newlines in a single patch, this problem can be
avoided.

These changes were done automatically by applying the following shell
command:

$ find . -name "*.java" -exec sed -i -e '$a\' {} \;

* Remove whitespaces at the end of source lines

This patch takes the de-facto standard of not having any whitespaces
at the end of source lines and applies it to all the source files in
the project.

Besides improving standardization, another contributing consideration
is the fact that many editors/IDEs remove such whitespaces at end of
lines. Using such an IDE will remove these whitespaces in the edited
file, adding "noise" to the patch and confusing potential reviewers.
By explicitly removing all of them in a single patch, this problem can
be avoided.

These changes were done automatically by applying the following shell
command:

$ find . -name "*.java" -exec sed -i 's/[ \t]*$//' {} \;
master branch: Fix JavaDoc generation on recent JDK 8 builds (#934)
Stack trace in JDK part contains also module name
Could be propagated by the way also in other places.
Fix test failing with Java 9-ea+146+
…elegating to verifyNoMoreInteractions (#995)

* Fixes #989
Introducing verifyNoInteractions, that checks if the number of
invocations on given mock(s) is zero, failing otherwise

* Added missing (?) @test annotation

* Removed try catch block by using isMock
[ci maven-central-release]
The original value in master branch was isNull(). Maybe that behavior can be
different if compiled with Java 6 compatibility.
Also bump Build Scan version for Gradle 4 compatibility.
Backport fixes of release/2.x to master
Backport fixes from release/2.x to master
Backport fixes release/2.x to master
as opposed to VerificationAfterDelay, VerificationWithTimout doesn't support never()
replace parameters with arguments
@TimvdLippe
Copy link
Contributor

This should not be merged.

@TimvdLippe TimvdLippe closed this Jan 21, 2019
@TimvdLippe TimvdLippe deleted the master branch April 30, 2019 15:12
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.

None yet