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

Run CI on Java 17 #2417

Merged
merged 8 commits into from Sep 24, 2021
Merged

Run CI on Java 17 #2417

merged 8 commits into from Sep 24, 2021

Conversation

TimvdLippe
Copy link
Contributor

Let's see how far we can get.

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2021

Codecov Report

Merging #2417 (f2e4b0a) into main (481639c) will increase coverage by 1.12%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #2417      +/-   ##
============================================
+ Coverage     85.45%   86.57%   +1.12%     
+ Complexity     2799     2762      -37     
============================================
  Files           330      318      -12     
  Lines          8478     8299     -179     
  Branches       1026     1015      -11     
============================================
- Hits           7245     7185      -60     
+ Misses          955      841     -114     
+ Partials        278      273       -5     
Impacted Files Coverage Δ
.../exceptions/ExceptionIncludingMockitoWarnings.java 0.00% <0.00%> (-100.00%) ⬇️
.../internal/invocation/DefaultInvocationFactory.java 84.61% <0.00%> (-15.39%) ⬇️
...l/configuration/plugins/DefaultMockitoPlugins.java 89.65% <0.00%> (-1.26%) ⬇️
src/main/java/org/mockito/ArgumentMatchers.java 98.96% <0.00%> (-0.11%) ⬇️
...ito/configuration/DefaultMockitoConfiguration.java 100.00% <0.00%> (ø)
...to/internal/configuration/GlobalConfiguration.java 100.00% <0.00%> (ø)
...to/internal/configuration/SpyAnnotationEngine.java 98.41% <0.00%> (ø)
...to/internal/verification/VerificationDataImpl.java 100.00% <0.00%> (ø)
...internal/configuration/plugins/PluginRegistry.java 100.00% <0.00%> (ø)
...ceptions/verification/TooFewActualInvocations.java 100.00% <0.00%> (ø)
... and 23 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 481639c...f2e4b0a. Read the comment docs.

@TimvdLippe TimvdLippe marked this pull request as ready for review September 1, 2021 13:41
@@ -34,6 +35,7 @@ public void is_type_mockable_excludes_primitive_wrapper_classes() {
}

@Test
@Ignore("Broken on JDK 17")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were only running this on 17, but it seems to be failing anyways 😢

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the test!

@TimvdLippe
Copy link
Contributor Author

The CodeCov diff now shows we are correctly using the Java 16+ codepath for invoking the relevant proxy method in the proxy mockmaker. So everything is working as expected and we have more code coverage 🎉

@TimvdLippe
Copy link
Contributor Author

@raphw Do you mind taking a look at the disabled test and let me know if that is intended?

@@ -26,7 +26,7 @@ jobs:
# Definition of the build matrix
strategy:
matrix:
java: [8, 11, 15]
java: [8, 11, 17-ea]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without ea now.

@@ -34,6 +35,7 @@ public void is_type_mockable_excludes_primitive_wrapper_classes() {
}

@Test
@Ignore("Broken on JDK 17")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the test!

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

3 participants