Backport fixes release/2.x to master #1238

TimvdLippe · 2017-11-02T11:04:05Z

Update licenses
Remove unused buildSrc
Remove old gradle files
Add some more tests
Fix coverage

Replace string concatination inside an append call with a chained append calls to make the code a tad easier to read, so the reader isn't left wondering why some of the concatinations are done with appends and some with the + operator.

…3034 [ci skip-release]

Update license plugin and add missing license headers

…3038 [ci skip-release]

Add regression test for issue #1174

* Add @CheckReturnValue to stubbing/verification methods * Clarify documentation on annotation

…3048 [ci skip-release]

* Enable jacoco coverage on subprojects * Reduce duplication in JaCoCo configuration for subprojects * Remove unused logger message

TimvdLippe · 2017-11-02T11:27:45Z

This PR is blocked on #1174

* Enable Checkstyle for checking license headers * Enable license check for all subprojects and fix test license headers * Apply license task to all projects

…3076 [ci skip-release]

Fixes #1243: Support for new version number 10.

…3082 [ci skip-release]

…3087 [ci skip-release]

- skipComparePublications if we are publishing to central

Update shipkit and configure assertReleaseNeeded task

* Update Kotlin to latest version * Update kotlin dependency syntax * Fix the build

…3117 [ci skip-release]

Fixes #1254 and #1256: improved check for self-invocation.

…3119 [ci skip-release]

codecov-io · 2017-12-01T20:56:13Z

Codecov Report

Merging #1238 into master will increase coverage by 0.84%.
The diff coverage is 93.33%.

@@             Coverage Diff              @@
##             master    #1238      +/-   ##
============================================
+ Coverage     87.32%   88.17%   +0.84%     
- Complexity     2304     2320      +16     
============================================
  Files           287      284       -3     
  Lines          5879     5867      -12     
  Branches        709      708       -1     
============================================
+ Hits           5134     5173      +39     
+ Misses          553      515      -38     
+ Partials        192      179      -13

Impacted Files	Coverage Δ	Complexity Δ
...va/org/mockito/internal/util/collections/Sets.java	`50% <ø> (+7.14%)`	`3 <0> (ø)`	⬇️
src/main/java/org/mockito/Mockito.java	`96.66% <ø> (ø)`	`40 <0> (ø)`	⬇️
...l/configuration/plugins/DefaultMockitoPlugins.java	`73.68% <ø> (ø)`	`6 <0> (ø)`	⬇️
...a/org/mockito/internal/creation/SuspendMethod.java	`80% <ø> (+40%)`	`3 <0> (+1)`	⬆️
...nternal/listeners/VerificationStartedNotifier.java	`97.22% <ø> (ø)`	`7 <0> (ø)`	⬇️
.../internal/invocation/DefaultInvocationFactory.java	`100% <ø> (ø)`	`2 <0> (ø)`	⬇️
...va/org/mockito/internal/invocation/RealMethod.java	`91.66% <ø> (ø)`	`0 <0> (ø)`	⬇️
...java/org/mockito/internal/exceptions/Reporter.java	`92.74% <ø> (ø)`	`94 <0> (ø)`	⬇️
.../internal/junit/MismatchReportingTestListener.java	`100% <100%> (ø)`	`4 <0> (ø)`	⬇️
.../internal/creation/bytebuddy/MockMethodAdvice.java	`72.56% <100%> (+10.4%)`	`20 <6> (+6)`	⬆️
... and 10 more

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 79a090d...77259fa. Read the comment docs.

TimvdLippe · 2017-12-01T21:08:33Z

If anyone wants to take another look at this PR, feel free to comment. Since all code has been reviewed already, I will be merging this PR tomorrow if no issues are found.

szpak · 2017-12-01T22:02:08Z

LGTM (from the bird's eye view).

Thanks for taking care about that. The need to switch to 3.x is just a matter of time * and your work will be priceless then

* - years are still a matter of time ;)

TimvdLippe and others added 12 commits October 22, 2017 16:43

Add regression test for issue #1174

e1c570d

Update GenericsMockitoAnnotationsTest.java

9f5312b

Update license plugin and add missing license headers

e7da7ef

InvocationsPrinter string concatination (#1231)

74825cd

Replace string concatination inside an append call with a chained append calls to make the code a tad easier to read, so the reader isn't left wondering why some of the concatinations are done with appends and some with the + operator.

2.11.3 release (previous 2.11.2) + release notes updated by CI build …

eb71328

…3034 [ci skip-release]

Merge pull request #1227 from mockito/update-licenses

fefc64a

Update license plugin and add missing license headers

2.11.4 release (previous 2.11.3) + release notes updated by CI build …

ca2a246

…3038 [ci skip-release]

Merge pull request #1219 from mockito/regression-test-1174

c2d8f02

Add regression test for issue #1174

Add @CheckReturnValue to stubbing/verification methods (#1228)

08c13b2

* Add @CheckReturnValue to stubbing/verification methods * Clarify documentation on annotation

2.11.5 release (previous 2.11.4) + release notes updated by CI build …

f5bf1db

…3048 [ci skip-release]

Enable jacoco coverage on subprojects (#1229)

b8c2811

* Enable jacoco coverage on subprojects * Reduce duplication in JaCoCo configuration for subprojects * Remove unused logger message

Merge branch 'release/2.x' into backport-fixes

0626865

TimvdLippe mentioned this pull request Nov 2, 2017

java.lang.ClassCastException with generic types #1174

Open

TimvdLippe and others added 16 commits November 3, 2017 23:55

Remove service-worker from Javadoc generation (#1244)

81d90ae

Enable Checkstyle for checking license headers (#1242)

ae314e5

* Enable Checkstyle for checking license headers * Enable license check for all subprojects and fix test license headers * Apply license task to all projects

2.11.6 release (previous 2.11.5) + release notes updated by CI build …

84c82ca

…3076 [ci skip-release]

Fixes #1243: Support for new version number 10.

6beac52

Merge pull request #1250 from mockito/java-10

9cf900f

Fixes #1243: Support for new version number 10.

2.11.7 release (previous 2.11.6) + release notes updated by CI build …

71f7240

…3082 [ci skip-release]

[ci maven-central-release]

9c2c00d

[ci maven-central-release]

5f568d2

[ci maven-central-release]

45ec2af

[ci maven-central-release]

1e4cb97

2.12.0 release (previous 2.11.7) + release notes updated by CI build …

907e3de

…3087 [ci skip-release]

make use of shipkit v0.9.143

467d8e8

make use of shipkit v0.9.144

cb9eec4

- skipComparePublications if we are publishing to central

get rid of outdated hint

2e2bfd3

Merge pull request #1265 from epeee/update_shipkit

442277f

Update shipkit and configure assertReleaseNeeded task

Fixes #1254 and #1256: improved check for self-invocation.

6139ed1

TimvdLippe and others added 7 commits November 23, 2017 15:51

Update Kotlin to latest version (#1263)

2efa9c7

* Update Kotlin to latest version * Update kotlin dependency syntax * Fix the build

Remove several container classes and inline code (#1247)

ebddc41

2.12.1 release (previous 2.12.0) + release notes updated by CI build …

f92f9e3

…3117 [ci skip-release]

Merge pull request #1257 from mockito/self-invoke-fix

dad7ca8

Fixes #1254 and #1256: improved check for self-invocation.

2.12.2 release (previous 2.12.1) + release notes updated by CI build …

fb8b482

…3119 [ci skip-release]

Merge branch 'release/2.x' into backport-fixes

fb9176a

Disable broken test for now

77259fa

szpak merged commit 682ea1f into master Dec 1, 2017

TimvdLippe deleted the backport-fixes branch October 9, 2018 15:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backport fixes release/2.x to master #1238

Backport fixes release/2.x to master #1238

TimvdLippe commented Nov 2, 2017

TimvdLippe commented Nov 2, 2017

codecov-io commented Dec 1, 2017 •

edited

TimvdLippe commented Dec 1, 2017

szpak commented Dec 1, 2017 •

edited

Backport fixes release/2.x to master #1238

Backport fixes release/2.x to master #1238

Conversation

TimvdLippe commented Nov 2, 2017

TimvdLippe commented Nov 2, 2017

codecov-io commented Dec 1, 2017 • edited

Codecov Report

TimvdLippe commented Dec 1, 2017

szpak commented Dec 1, 2017 • edited

codecov-io commented Dec 1, 2017 •

edited

szpak commented Dec 1, 2017 •

edited