Skip to content

Conversation

tmurakami
Copy link
Contributor

Moved the resources directory to src/main so that the MockMaker file is included in mockito-inline.jar.
Also added two tests to verify plugin-type is inline.

This PR fixes #929.

@codecov-io
Copy link

codecov-io commented Feb 5, 2017

Codecov Report

❗ No coverage uploaded for pull request base (release/2.x@442887e). Click here to learn what that means.

@@              Coverage Diff               @@
##             release/2.x     #931   +/-   ##
==============================================
  Coverage               ?   86.64%           
  Complexity             ?     2244           
==============================================
  Files                  ?      288           
  Lines                  ?     5712           
  Branches               ?      657           
==============================================
  Hits                   ?     4949           
  Misses                 ?      574           
  Partials               ?      189

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 442887e...3d11f6c. Read the comment docs.

@TimvdLippe
Copy link
Contributor

I think the path should be src/test/resources though, as Mockito is only used during testing.

@tmurakami
Copy link
Contributor Author

According to #920, this library seems to enable mock-maker-inline without setting.

I suppose that its usage is as follows:

dependencies {
    testCompile 'org.mockito:mockito-inline:+'
}

However, as shown in #929, mockito-inline.jar does not include the MockMaker configuration file, so mock-maker-inline cannot be enabled.
To include the configuration file in this jar, I think the path is src/main/resources.

@raphw raphw merged commit 9b42765 into mockito:release/2.x Feb 7, 2017
@tmurakami tmurakami deleted the fix_issue_929 branch February 8, 2017 04:22
@bric3
Copy link
Contributor

bric3 commented Feb 17, 2017

@TimvdLippe src/test is not packaged ;)

@TimvdLippe
Copy link
Contributor

Ah of course. My mistake

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.

New 'mockito-inline' artifact does not work
5 participants