summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-15Merge "Add mockito-inline for host tests" am: e64ea0b85e am: 2f4a87c5c2Philip P. Moltmann
am: 3fb6123bd1 Change-Id: Idd26b2685f681dab1274b171cc6b9b3d3d73acec
2017-12-15Merge changes from topic "BackportMockito212" am: deea179464 am: 7c9d4f5a11Philip P. Moltmann
am: 9ca7c92946 Change-Id: I2aeaff1997a7ac9ad2a632d4212eb5ba9c822263
2017-12-15Update mockito to 2.12.0 am: 36048520ee am: 87b5fadc27Philip P. Moltmann
am: 1eba47f0d6 -s ours Change-Id: I699058d5297884f12ad2d7c4391e76ca0af5571f
2017-12-15Merge "Add mockito-inline for host tests" am: e64ea0b85ePhilip P. Moltmann
am: 2f4a87c5c2 Change-Id: I407dc6d59a5c1717d2510b8619ab34383376ea8d
2017-12-15Merge changes from topic "BackportMockito212" am: deea179464Philip P. Moltmann
am: 7c9d4f5a11 Change-Id: Ic4653024115f05d0d1f18c297c6ba424a63e1854
2017-12-15Update mockito to 2.12.0 am: 36048520eePhilip P. Moltmann
am: 87b5fadc27 Change-Id: I6506ef98d6ae9862c03fa3c2502b8da635070d38
2017-12-15Merge "Add mockito-inline for host tests"Philip P. Moltmann
am: e64ea0b85e Change-Id: Ie46324c67c5f99ab23610388d9e70a661c7fd7bf
2017-12-15Merge changes from topic "BackportMockito212"Philip P. Moltmann
am: deea179464 Change-Id: I1f0d5b3851818961d9a660d56f44149a37dab960
2017-12-15Update mockito to 2.12.0Philip P. Moltmann
am: 36048520ee Change-Id: I1ec99ada16c962646ce23b7c12fa2a81b59d109e
2017-12-15Merge "Add mockito-inline for host tests"android-wear-8.0.0_r1Treehugger Robot
2017-12-15Merge changes from topic "BackportMockito212"Treehugger Robot
* changes: Stubbed DefaultInvocationFactory to fix build Update mockito to 2.12.0
2017-12-14Add mockito-inline for host testsPhilip P. Moltmann
Test: m -j mockito-inline and checked the contents of the jar Change-Id: Ia7e6e74464c7732559eeb48564a0a781262d998c
2017-12-14Update mockito to 2.12.0Philip P. Moltmann
Change-Id: I96a0d42128ceba1c7c5e096e3d982721a474a40c Fixes: 69848252 Test: m -j checkbuild
2017-12-14Stubbed DefaultInvocationFactory to fix buildPhilip P. Moltmann
It is only used for powermockito support which is not used on Android. Test: m -j checkbuild Change-Id: I9a4d0cb0deccd28879853e8e56b71291a643392f
2017-12-14Merge "Add metadata" am: 665f068f46 am: f543d00f28Bill Yi
am: 01ff8fe224 Change-Id: Ie2da8cf3b9e22b0da117e1c10ec26ff2c804eb71
2017-12-14Merge "Add metadata" am: 665f068f46Bill Yi
am: f543d00f28 Change-Id: I9d2b0e98f948d6e059476da907aac00cc5c08033
2017-12-14Merge "Add metadata"Bill Yi
am: 665f068f46 Change-Id: I6be17ff3c4a90f06d710a0e026c232b852f7c6c7
2017-12-14Merge "Add metadata"Treehugger Robot
2017-12-13Add metadataBill Yi
BUG:67772237 Change-Id: If584d7980d18e1eb71bdb32649ed33ac9f2c64fc
2017-12-13Stubbed DefaultInvocationFactory to fix buildPhilip P. Moltmann
It is only used for powermockito support which is not used on Android. Test: m -j checkbuild Change-Id: I9a4d0cb0deccd28879853e8e56b71291a643392f
2017-12-13Update mockito to 2.12.0Philip P. Moltmann
Change-Id: I96a0d42128ceba1c7c5e096e3d982721a474a40c Fixes: 69848252 Test: m -j checkbuild
2017-10-27Merge "Fix unbundled builds" am: 0f93899fea am: 4fc49a32d6Colin Cross
am: d1725726ae Change-Id: If90da0681b2af8d74cb0d8d0503981f9f744c9e6
2017-10-27Merge "Fix unbundled builds" am: 0f93899feaColin Cross
am: 4fc49a32d6 Change-Id: I71cc6b7154c6953daf886737f0363f7d13afc9b3
2017-10-27Merge "Fix unbundled builds"Colin Cross
am: 0f93899fea Change-Id: Ia0e252deebe647e5c5e4144c1934bdedcc611ebc
2017-10-26Merge "Fix unbundled builds"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Treehugger Robot
2017-10-26Fix unbundled buildsColin Cross
mockito-api should have been labeled sdk_version: 16 despite its lack of sources to avoid a dependency on core-oj and core-libart that breaks unbundled builds. Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L12200000115160652&nodeType=Trybot Change-Id: I9c5dc41e8a3e7a55cc7a15c2109c76cbe043443c
2017-10-24Merge "Convert external/mockito to Android.bp" am: 456d2927a6 am: 56daa9c3caColin Cross
am: 768e83ff3d Change-Id: Ifd856e8ea267f6d5a522a707e27d14c6323849f2
2017-10-24Merge "Convert external/mockito to Android.bp" am: 456d2927a6Colin Cross
am: 56daa9c3ca Change-Id: I5490577598d8dd389badca31514869161fda47f8
2017-10-24Merge "Convert external/mockito to Android.bp"Colin Cross
am: 456d2927a6 Change-Id: I556e70dba6a84145551a34894daf68f2549a3d36
2017-10-24Merge "Convert external/mockito to Android.bp"Treehugger Robot
2017-10-18Convert external/mockito to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I7a34fea3a7501304fe48b625ea46039215179744
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17 am: ↵oreo-mr1-devoreo-dr1-devChih-hung Hsieh
246a02724b am: ddc7186be0 Change-Id: I9eb70537d4553578241194fa9fda91e873b4b435
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: 246a02724b Change-Id: I763acf131bf008fd4b590f1d74fb1585b07fd8ee
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55Chih-hung Hsieh
am: 07c9d5af17 Change-Id: Ic05a64850960a629933b60bba236c24dcbfc29b2
2017-06-06Merge "Add OWNERS in external/mockito"Chih-hung Hsieh
am: 0211c64d55 Change-Id: I2d1d4b84577ebf94fc9d22704d371061bf169ca1
2017-06-06Merge "Add OWNERS in external/mockito"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/mockitoChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I4f9b5fb3a1506a4cd6e2acd028e91a4f0da7605e
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118 ↵android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
am: 2916273738 am: 040b2c0a15 Change-Id: I46441d26b2257ba71f39a009ccd9039a0b3d01d1
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118Paul Duffin
am: 2916273738 Change-Id: I15b93df39518c96865396bcd714d6722b9e7c62f
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
am: 03585bc118 Change-Id: I8015d3e020cff8e2dc71c6568eb5a0bf698a36e5
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"Treehugger Robot
2017-03-24Update .gitignore file to ignore IntelliJ IDEA filesPaul Duffin
Test: git status to make sure the files do not appear Change-Id: I4f03b2a44fe05ca5831511f3fdd41e364e3faf2d
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7 am: ↵Paul Duffin
bc54862ce5 am: 1a2f33483f Change-Id: I4f071e00edebab29254318e8229ac3c6e8b61979
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7Paul Duffin
am: bc54862ce5 Change-Id: Ia2f17389cbd3c278522c2fc021b961d492a348b7
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Paul Duffin
am: 8367d36ae7 Change-Id: Ic6f286637703eca3c526ee582ea25f892d16d596
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Treehugger Robot
2017-03-17Remove unneeded call to all-makefiles-underPaul Duffin
It was only added to prevent conflicts with downstream and it is no longer needed downstream. Bug: 32912773 Test: make checkbuild Change-Id: I4fa9568b6ea7e745b0c8adffd0b1ab751ddf715e
2017-03-17Remove unused mockito-updated/ directoryPaul Duffin
Bug: 32912773 Test: make checkbuild Change-Id: I6712cd663957332c33ddc0ca6d669f4fffb0964d
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 55c52fc184 am: 9a76153826Paul Duffin
am: c091ec8258 Change-Id: I68025ddd72ddc70888f0a275cdf8ea504e85f13f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 15:59:22 +0000