Feature 2921 generic types #2923

jfrantzius · 2023-02-22T15:51:14Z

Fixes #2921 by preserving and using the generic Java type information that was previously lost to type erasure.

Contains a JUnit test with usage example, demonstrating that fields with generic types do not need to have matching names anymore.

codecov-commenter · 2023-02-27T21:26:09Z

Codecov Report

Patch coverage: 87.71% and project coverage change: +0.01 🎉

Comparison is base (8b96cc1) 85.65% compared to head (3ac47be) 85.66%.

❗ Current head 3ac47be differs from pull request most recent head 40a2fe6. Consider uploading reports for the commit 40a2fe6 to get more accurate results

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #2923      +/-   ##
============================================
+ Coverage     85.65%   85.66%   +0.01%     
- Complexity     2847     2861      +14     
============================================
  Files           325      325              
  Lines          8623     8678      +55     
  Branches       1060     1070      +10     
============================================
+ Hits           7386     7434      +48     
- Misses          964      967       +3     
- Partials        273      277       +4

Impacted Files	Coverage Δ
...guration/injection/PropertyAndSetterInjection.java	`97.67% <ø> (ø)`
...ion/injection/filter/NameBasedCandidateFilter.java	`100.00% <ø> (ø)`
.../injection/filter/TerminalMockCandidateFilter.java	`84.61% <ø> (ø)`
...o/internal/creation/settings/CreationSettings.java	`96.49% <50.00%> (-3.51%)`	⬇️
...ion/injection/filter/TypeBasedCandidateFilter.java	`90.56% <88.88%> (-9.44%)`	⬇️
...nternal/configuration/MockAnnotationProcessor.java	`97.36% <100.00%> (+0.07%)`	⬆️
...to/internal/configuration/SpyAnnotationEngine.java	`98.50% <100.00%> (+0.09%)`	⬆️
...rg/mockito/internal/creation/MockSettingsImpl.java	`88.57% <100.00%> (+0.22%)`	⬆️
...nal/creation/instance/ConstructorInstantiator.java	`96.20% <0.00%> (ø)`

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java

TimvdLippe · 2023-02-27T22:05:18Z

src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java

+            WildcardType wildcardTypeToMock = (WildcardType) typeToMock;
+            Type[] upperBounds = wildcardTypeToMock.getUpperBounds();
+            return Arrays.stream(upperBounds).anyMatch(t -> isCompatibleTypes(t, mockType));
+        } else if (typeToMock instanceof GenericArrayType && mockType instanceof GenericArrayType) {


CodeCov reports this branch is not covered. Can you please expand the coverage here or remove this check?

The WildcardType part is covered:

But you are right that the GenericTypeArrayType part from line 64 isn't. I'll remove it, as Mockito cannot mock Array types (as I found out in a test)

Removed not covered code

There is still some coverage missing, can you either remove the uncovered branches or add regression tests that cover the logic? https://app.codecov.io/gh/mockito/mockito/pull/2923/blob/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java Since this is intricate logic and a hot codepath, I would like to see full coverage here.

subprojects/junit-jupiter/src/test/java/org/mockitousage/GenericTypeMockTest.java

jfrantzius · 2023-02-28T11:43:32Z

@TimvdLippe please review and resolve where appropriate

jfrantzius · 2023-02-28T20:00:50Z

https://github.com/mockito/mockito/actions/runs/4296719412/jobs/7488794171

> Task :androidTest:connectedDebugAndroidTest
Starting 0 tests on test(AVD) - 13
Test run failed to complete. No test results. onError: commandError=true message=Attempt to invoke interface method 'boolean android.app.IActivityManager.startInstrumentation(android.content.ComponentName, java.lang.String, int, android.os.Bundle, android.app.IInstrumentationWatcher, android.app.IUiAutomationConnection, int, java.lang.String)' on a null object reference

> Task :androidTest:connectedDebugAndroidTest FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':androidTest:connectedDebugAndroidTest'.
> There were failing tests. See the report at: file:///Users/runner/work/mockito/mockito/subprojects/androidTest/build/reports/androidTests/connected/index.html

I don't know what to make of this, maybe just re-run?

jfrantzius · 2023-03-01T10:56:14Z

@TimvdLippe thx for restarting the build. Did you have a chance to take a look at my comments on your review?

Sorry for maybe being pushy, but I have some time on my hands for this at the moment, which might change soon. Also I don't know under what circumstances you are able to devote time to Mockito :)

TimvdLippe · 2023-03-01T17:20:35Z

I am on vacation this week, but should be back next week to review.

jfrantzius · 2023-03-02T11:12:52Z

Alright, have a nice vacation!

TimvdLippe · 2023-03-04T14:40:04Z

@jfrantzius Apart from the missing code coverage, this PR LGTM!

jfrantzius · 2023-03-06T12:49:27Z

@TimvdLippe I added more test coverage

TimvdLippe · 2023-03-06T17:11:42Z

@jfrantzius please look at the code coverage report and see which branches are missing coverage. There are still some missing, for example one where the generic types don't match.

jfrantzius · 2023-03-06T23:55:50Z

I added support for generic injectee classes, e.g.

        public class UnderTestWithTypeParameters<T1, T2> {
            List<T1> t1List;
            Set<T2> t2Set;
        }

There is one line that cannot be covered in tests, please see the comment there: https://github.com/jfrantzius/mockito/blob/feature-2921-generic-type/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java#L70

jfrantzius · 2023-03-07T19:02:09Z

Could you please approve the workflow @TimvdLippe ?

jfrantzius · 2023-03-08T23:02:39Z

@TimvdLippe I'm off for today, if you trigger the build then the last line missing in coverage should now be covered as well.

jfrantzius · 2023-03-09T09:30:25Z

I guess it's time to setup Spotless in my IDE ...

jfrantzius · 2023-03-09T11:02:38Z

I would love to be able to start builds, but unfortunately I have to always bug you about it @TimvdLippe :)

jfrantzius · 2023-03-09T16:47:15Z

@TimvdLippe build might need another nudge in https://github.com/mockito/mockito/actions/runs/4372977101/jobs/7658608894

/bin/sh -c exit $(cat gradle.exit)
Error: The process '/bin/sh' failed with exit code 1
Terminate Emulator
INFO    | Wait for emulator (pid 3622) 20 seconds to shutdown gracefully before kill;you can set environment variable ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL(in seconds) to change the default value (20 seconds)

jfrantzius · 2023-03-09T19:18:23Z

WDYT @TimvdLippe , is it good to merge?

TimvdLippe

Thanks for all the work, this LGTM!

Jörg von Frantzius added 2 commits February 22, 2023 16:29

mockito#2921 preserve and use generic type info

b27238a

Fixes mockito#2921 : work around Java type erasure

c6acab8

jfrantzius mentioned this pull request Feb 22, 2023

Use generic type information in TypeBasedCandidateFilter to circumvent type erasure #2921

Closed

jfrantzius and others added 8 commits February 25, 2023 12:51

Merge branch 'mockito:main' into feature-2921-generic-type

2f6cf4e

mockito#2921: Android 26 compatibility

b8e1cd5

mockito#2921: fix formatting

adc5933

mockito#2921 maintain generic type info for spys as well

4552850

mockito#2921 evaluate type arguments and raw types

5617b2e

mockito#2921 formatting, header

b0d1577

mockito#2921 more tests

77fe09e

mockito#2921: spotless formatting

19f088c

mockito#2921: test nested type parameters

c9363cb

TimvdLippe requested changes Feb 27, 2023

View reviewed changes

Jörg von Frantzius added 3 commits February 28, 2023 12:34

mockito#2921: fix for multiple type arguments

62b6a10

mockito#2921: split into separate nested test classes

3d4b6c1

mockito#2921 remove obsolete check for GenericArrayType

0baf4c5

jfrantzius requested a review from TimvdLippe February 28, 2023 11:55

mockito#2921: spotless

93eee06

FabrizzioRuiz approved these changes Mar 3, 2023

View reviewed changes

mockito#2921: test for multiple candidates

58ecada

mockito#2921: verify mock creation worked

3379467

mockito#2921: support for generic injectee classes

55fd228

Jörg von Frantzius added 3 commits March 7, 2023 19:50

mockito#2921 test with fields that only differ by type variable

70883fb

mockito#2921 fix: compare type variable by index instead of any matching

5b414c4

mockito#2921 add comment

02c7d3e

Jörg von Frantzius added 4 commits March 8, 2023 01:30

mockito#2921: spotless

7af4cfc

mockito#2921 remove unnecessary if clauses

45110df

mockito#2921: remove unused variables

3ac47be

mockito#2921 make sure all codepaths can be covered in test

40a2fe6

mockito#2921 spotless

42e4f0a

Merge branch 'main' into feature-2921-generic-type

162e061

TimvdLippe approved these changes Mar 9, 2023

View reviewed changes

TimvdLippe merged commit 74c811a into mockito:main Mar 9, 2023

TimvdLippe mentioned this pull request Mar 31, 2023

ClassCastException when combining InjectMocks with generified Mock field #2958

Closed

cpovirk mentioned this pull request Apr 17, 2023

@Mock(serializable = true) no longer works with parameterized types #2979

Closed

daniel-matheis-vivavis mentioned this pull request Mar 13, 2024

In TypeBasedCandidateFilter.isCompatibleTypes -> ClassCastException: class TypeVariableImpl cannot be cast to class Class #3294

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature 2921 generic types #2923

Feature 2921 generic types #2923

jfrantzius commented Feb 22, 2023

codecov-commenter commented Feb 27, 2023 •

edited

TimvdLippe Feb 27, 2023

jfrantzius Feb 27, 2023

jfrantzius Feb 28, 2023

TimvdLippe Mar 4, 2023

jfrantzius commented Feb 28, 2023

jfrantzius commented Feb 28, 2023

jfrantzius commented Mar 1, 2023

TimvdLippe commented Mar 1, 2023

jfrantzius commented Mar 2, 2023

TimvdLippe commented Mar 4, 2023

jfrantzius commented Mar 6, 2023

TimvdLippe commented Mar 6, 2023

jfrantzius commented Mar 6, 2023

jfrantzius commented Mar 7, 2023

jfrantzius commented Mar 8, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

TimvdLippe left a comment

Feature 2921 generic types #2923

Feature 2921 generic types #2923

Conversation

jfrantzius commented Feb 22, 2023

codecov-commenter commented Feb 27, 2023 • edited

Codecov Report

TimvdLippe Feb 27, 2023

Choose a reason for hiding this comment

jfrantzius Feb 27, 2023

Choose a reason for hiding this comment

jfrantzius Feb 28, 2023

Choose a reason for hiding this comment

TimvdLippe Mar 4, 2023

Choose a reason for hiding this comment

jfrantzius commented Feb 28, 2023

jfrantzius commented Feb 28, 2023

jfrantzius commented Mar 1, 2023

TimvdLippe commented Mar 1, 2023

jfrantzius commented Mar 2, 2023

TimvdLippe commented Mar 4, 2023

jfrantzius commented Mar 6, 2023

TimvdLippe commented Mar 6, 2023

jfrantzius commented Mar 6, 2023

jfrantzius commented Mar 7, 2023

jfrantzius commented Mar 8, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

jfrantzius commented Mar 9, 2023

TimvdLippe left a comment

Choose a reason for hiding this comment

codecov-commenter commented Feb 27, 2023 •

edited