summaryrefslogtreecommitdiff
path: root/src/main/java/org/mockito/internal/creation
AgeCommit message (Collapse)Author
2019-09-10Revert "Update to Mockito v2.25.7."Garfield Tan
This reverts commit e14b62991dfb625a81997be77825455fdce66ebd. Bug: 140773999 Test: Builds. Change-Id: I299dabdf4fdb30845de3415ed8b2f727c5011098
2019-09-04Update to Mockito v2.25.7.Garfield Tan
Also introduce a host test to catch configuration mismatches between prebuilt bytebuddy libs and our runtime environment. Bug: 138669713 Test: atest CtsMockingTestCases CtsInlineMockingTestCases CtsMockingDebuggableTestCases CtsExtendedMockingTestCases Change-Id: Ieede7b2e9691398c6fc6b09328ae20d43c9eeb8d
2019-09-04Revert "New API to clean up all inline mocks after test"Garfield Tan
This reverts commit af0db2cb930b3f1bcdbd8832f10ceceb5b4cf268. This is part of the upcoming Mockito update. Bug: 138669713 Test: Builds. Change-Id: I7e90826fcad5b9b645bbfcacec6bd5741a867f70
2019-08-15New API to clean up all inline mocks after testSzczepan Faber
Exempt-From-Owner-Approval: Needed to unblock WM work and owner currently OOO for 2 weeks. We should probably get more people on the OWNERS file. Bug: 138669713 Test: Builds. Change-Id: I87f9039dc3e4c0d2e46082b998ca0e7dd044bbb5
2019-07-30Revert "Update to Mockito v2.25.7."Dan Shi
This reverts commit feedf5422d04e9d37a8f7c8e76d17f2cf7378924. Reason for revert: b/138648173 Change-Id: I21b2147346f42bb35ef263f333ff08f1b1216ae3 Exempt-From-Owner-Approval: fix tot
2019-07-09Update to Mockito v2.25.7.Garfield Tan
Bug: 123984854 Test: atest CtsMockingTestCases CtsInlineMockingTestCases CtsMockingDebuggableTestCases CtsExtendedMockingTestCases Change-Id: I65118f22e9b53b078276263189dcd1cdd71a53b5
2018-09-06Update mockito to v2.21.0Philip P. Moltmann
Test: atest CtsMockingTestCases CtsInlineMockingTestCases CtsMockingDebuggableTestCases CtsExtendedMockingTestCases Change-Id: I4f6afc6ff576343a15625465151141cd2abef802
2018-08-28Revert "Revert "Update mockito on AOSP to same version as on internal master""Philip P. Moltmann
This reverts commit 0a0255ce0b22e9660bef08a4c5041c7f6a9667c7. Reason for revert: Fix in I5094fa145fc5f6d5c5d9426b07d764c07e545819 Change-Id: Id2ee88e07c439d2ef7b6a876d3c68b50bd37d157
2018-08-28Revert "Update mockito on AOSP to same version as on internal master"Philip P. Moltmann
This reverts commit 31b8dd0cbc0246fdab7ec2e9d1fd9fc822eac46d. Reason for revert: Breaks errorprone build Change-Id: Iaf0e1154a109d435ade1b45b1518e178228bfb67
2018-08-21Update mockito on AOSP to same version as on internal masterPhilip P. Moltmann
Bug: 109745050 Test: atest CtsMockingTestCases CtsInlineMockingTestCases CtsMockingDebuggableTestCases CtsExtendedMockingTestCases Change-Id: I1cbfd730f47be12d448b61509d2760ca60eea895 Merged-In: I76c21bca99a348d2a91e9bc5b3533f532baea246
2018-03-13Update to mockito 2.16.0android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devPhilip P. Moltmann
Test: atest CtsMockingTestCases CtsInlineMockingTestCases Bug: 74344734 Change-Id: I20ac20aebdb4d7a184d85ad3657585b415f03b7f
2017-12-13Update mockito to 2.12.0Philip P. Moltmann
Change-Id: I96a0d42128ceba1c7c5e096e3d982721a474a40c Fixes: 69848252 Test: m -j checkbuild
2017-03-14Upgrade to Mockito v2.7.13Paul Duffin
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
2017-03-07Restructure files to match upstream mockitoPaul Duffin
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 07:49:57 +0000