Commit Graph
12 Commits
Author SHA1 Message Date
Paul Duffin ee40b6007d Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d
am: 0188c2ac3e

Change-Id: Ie8464f8b26188b12837d3eaead36eb94bf150a64
2017-03-10 00:08:31 +00:00
Paul Duffin 0188c2ac3e Refactor code incompatible with Mockito 2.7.13 am: d529415c68
am: 65a7c6845d

Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c
2017-03-09 23:59:31 +00:00
Paul Duffin 65a7c6845d Refactor code incompatible with Mockito 2.7.13
am: d529415c68

Change-Id: I9c5f55ea1e7b9224033435159b19ef81fa9832e3
2017-03-09 23:56:06 +00:00
Paul Duffin d529415c68 Refactor code incompatible with Mockito 2.7.13
Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
2017-03-09 18:49:41 +00:00
Paul Duffin 3dd54cd669 Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742
am: 872137e536

Change-Id: I5a98e76df88ad9524916b5b8757755f58df3e849
2017-03-03 14:47:08 +00:00
Paul Duffin 872137e536 Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
am: 3fc616a742

Change-Id: Ib4ed27bf723799aede7d198939c5e22def4af5a5
2017-03-03 14:44:15 +00:00
Paul Duffin 3fc616a742 Prepare for removal of junit and android.test classes from Android API (step 1)
am: e98e557469

Change-Id: I9cf742acbfeda8755f8b0c41be0088617d3d3025
2017-03-03 14:41:46 +00:00
Paul Duffin e98e557469 Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
2017-03-01 13:21:11 +00:00
Paul Duffin 5a41083bb4 Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644
am: 613ba55900

Change-Id: I563bd41bf19d58268fa82194c58880a329fbdbc7
2017-02-21 18:20:20 +00:00
Paul Duffin 613ba55900 Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8
am: 3cce9e3644

Change-Id: Id61aac4365d076ee036fa9845f0b8e10718deff9
2017-02-21 18:10:13 +00:00
Paul Duffin 3cce9e3644 Use com.android.messaging.util.Assert instead of junit.framework.Assert
am: 991c2e5ab8

Change-Id: Ifb50be13961d566c58c25c3f9f6e7a4ac4b6a260
2017-02-21 18:01:15 +00:00
Paul Duffin 991c2e5ab8 Use com.android.messaging.util.Assert instead of junit.framework.Assert
Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18
2017-02-21 11:23:14 +00:00