| 2637d96c202372854a7c71466ddcc6e90fc4fc53 |
|
07-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Upgrade to Mockito v2.7.13
Renames README.android to README.version to match most common
use of the file name.
Deletes the compat classes, they will be added later, along
with an upstream patch.
Bug: 32912773
Test: see following commit
Change-Id: Iaa4d16b2a5a71955d7ecddf195ae681cf6505088
/external/mockito/src/main/java/org/mockito/internal/invocation/InvocationImpl.java
|
| 42efad642017b248b16752f8754b1a661345e36e |
|
08-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Add classes and methods to aid in the upgrade to 2.7.13
Unsurprisingly there are a number of incompatibilities between
the current version (1.10.19) and 2.7.13. These classes and
methods were added to fix the problems found while trying to
build against 2.7.13.
The classes in org.mockito.compat were added to act as a layer
to insulate the code against those changes in mockito. The
intent is that the existing code will be changed to use those
classes instead of the ones that they extend so it builds
against 1.10.19. Then the upgrade will modify those classes
to make them work with 2.7.13 so that the code continues to
build. After the upgrade has been completed then the code that
used those compat classes will be modified to use standard
mockito and the classes will be deleted.
The MockitoHamcrest method exists upstream, this is just a
copy of that which works in 2.7.13. This is needed to support
using hamcrest based matchers with mockito.
The changes to InvocationOnMock adds a method that is new in
2.7.13 and deprecate the method that will be removed. Existing
code will be modified to use the new method and the upgrade will
delete the old one.
Bug: 32912773
Test: make checkbuild
Change-Id: I31dc4d3fc84558afda0c00f8054ec1fd4ec54c5a
/external/mockito/src/main/java/org/mockito/internal/invocation/InvocationImpl.java
|
| d174d376bccaf52c3273473bcc34bdb11b50bd67 |
|
03-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Restructure files to match upstream mockito
Makes the file structure match upstream mockito so that it is
simpler to update in future. Moving the files as a separate
step to upgrading makes it easier for git to track renames and
simplifies future diffs and reviews.
Bug: 32912773
Test: make checkbuild
Change-Id: I884ba2cc2856fd19d31bdb658fa058c47d078982
/external/mockito/src/main/java/org/mockito/internal/invocation/InvocationImpl.java
|