| 314cb2efb7b1d8d9b584a6e0bd82727168cfd181 |
|
21-May-2018 |
Philip P. Moltmann <moltmann@google.com> |
DO NOT MERGE: Revert "DO NOT MERGE: Revert "Allow mocks to call blackisted APIs""
This reverts commit 8738f6764b9f61eb11ad678cad6d9434b4133731.
Reason for revert: This was only a temporary revert. Now that the real issue is fixed, we can submit this again
Bug: 80041014
Test: vts-tradefed run host --class com.android.tradefed.device.metric.VtsCoverageCollectorTest
atest CtsActivityManagerDeviceTestCases
atest CtsInputMethodTestCases
Change-Id: I8d0ac45e3fe73c1870cf08f989b6d39f09923183
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| 8738f6764b9f61eb11ad678cad6d9434b4133731 |
|
21-May-2018 |
Philip P. Moltmann <moltmann@google.com> |
DO NOT MERGE: Revert "Allow mocks to call blackisted APIs"
This reverts commit 5529c6ea5fd4cb3959f11c9b4b114361a3db2f73.
Bug: b/80041014
Change-Id: I01752919321eb5f7bfca8b069c3b13edb5d6ce95
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| 5529c6ea5fd4cb3959f11c9b4b114361a3db2f73 |
|
14-May-2018 |
Philip P. Moltmann <moltmann@google.com> |
Allow mocks to call blackisted APIs
Mark the following classes as trusted:
- All generated mock classes as they might directly call blacklisted
super-methods
- The leniant copy tool as it copies blacklisted fields
- The MockMethodAdvice as it calls blacklisted super-methods via
reflection
Test: atest CtsInlineMockingTestCases
CtsMockingTestCases
CtsMockingDebuggableTestCases
Fixes: 78235528
Change-Id: I374de11656ffa4a506f6c4436fcc45fe4b50af85
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| d4a20568bcbaa34526676e4758e011ea32784825 |
|
13-Mar-2018 |
Philip P. Moltmann <moltmann@google.com> |
Update dexmaker to almost 2.16
Test: atest CtsMockingTestCases CtsInlineMockingTestCases
Bug: 74344734
Change-Id: Ib79431a454b3ae9715906da61fc9267d54ae7f07
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| 171f097997993b84053f643dc275ce66364315ca |
|
20-Nov-2017 |
Philip P. Moltmann <moltmann@google.com> |
Update dexmaker to latest (master) state
This adds dexmaker-mockito-inline support and dexmaker-mockito-*-tests.
Inline mocking will allow mocking of final methods/classes.
Bug: 63538681
Test: cts-tradefed run cts-dev -m CtsMockingTestCases
Change-Id: Id8b88639abe0a84642273eae43322df09068a782
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| db20bbcc82de39f499a804d215851995041f3bcf |
|
15-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Reapply - Hacks to allow mocking of package private classes
2 things are required to allow mocking for package private classes.
First is creating the mock in the same class as the base, that part
is simple and seems to have no effect. The second is to have a matching
ClassLoader as the source class.
To make the classloader match, instead of generating a new ClassLoader,
add the new dex to the existing one and share the base class's ClassLoader.
Since this is a persistent change and could affect the process, it will be
opt-in through setting a system property.
This also appears to have unintended speedup in the tests I was testing,
possible through cache fixes or brokenness.
(cherry picked from commit 31b974435499d3c9769ed6a746e946187f3be64f)
Test: Add System.setProperty("dexmaker.share_classloader", "true) to SysuiTestCase
then runtest systemui
Change-Id: I35c805ee3797ff151ac19bd0c931ebfd41d3b670
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|
| b8a5896885d4da2b798888b688a46df1adbf5b89 |
|
15-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Update to version 2.2.0 and make it build
Updated using ./update_source.sh 2.2.0
Added lib directory to contain prebuilt versions of the dx and
dex libraries to replace the contents of the dx directory which
was deleted upstream.
Bug: 36231644
Test: make checkbuild
Change-Id: I31de03f40e4af097be01b5d9f2fe2c71ae879b54
/external/dexmaker/dexmaker/src/main/java/com/android/dx/DexMaker.java
|