Feature 2921 generic types - #2923

Codecov Report

Attention: Patch coverage is 90.16393% with 6 lines in your changes missing coverage. Please review.

Project coverage is 84.60%. Comparing base (9473470) to head (162e061).
Report is 367 commits behind head on main.

@@             Coverage Diff              @@
##               main    #2923      +/-   ##
============================================
- Coverage     85.65%   84.60%   -1.06%     
- Complexity     2847     2850       +3     
============================================
  Files           325      325              
  Lines          8623     8682      +59     
  Branches       1060     1071      +11     
============================================
- Hits           7386     7345      -41     
- Misses          964     1056      +92     
- Partials        273      281       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@TimvdLippe please review and resolve where appropriate

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?

@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 :)

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

Alright, have a nice vacation!

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

@TimvdLippe I added more test coverage

@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.

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

Could you please approve the workflow @TimvdLippe ?

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

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

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

@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)

WDYT @TimvdLippe , is it good to merge?