| ccc794a961024ef46abb10820dd7df0df576e552 |
|
23-Jan-2017 |
Paul Duffin <paulduffin@google.com> |
Allow JUnit to compile against external/hamcrest v2.0
Bug: 30946317
Test: make checkbuild
Change-Id: Idbeddca3346d43ed39cdbb0c6e44779b54f981a4
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|
| facdecc8e055d722b8c0e0c8fbf8a8644e7fec57 |
|
23-Jan-2017 |
Paul Duffin <paulduffin@google.com> |
Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"
This reverts commit 86f323b2a73c9c250fbe25b828435aa936704ab3.
Bug: 30946317
Test: make checkbuild
Change-Id: Ie72fec656d01f24a1724d33a35ceecdb57aaba57
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|
| a0b1fd6752e65aaeaddb1684cdbb1baabfa85433 |
|
30-Apr-2016 |
Ian Rogers <irogers@google.com> |
Extra generic type information to aid certain javacs.
In particular this is needed for the code to compile using the error prone
analyzer.
(cherry picked from 3b8fe889fba29c80db890e0ff58dde9e0a3cc544)
Bug: 27723540
Test: Copied to internal/master and ran error prone build
Change-Id: I5f70f09a189b4ad833a3ea4100eb978abae30849
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|
| 86f323b2a73c9c250fbe25b828435aa936704ab3 |
|
14-Dec-2016 |
Paul Duffin <paulduffin@google.com> |
Revert matchers back to 4.10 to compile against Hamcrest 1.1
JUnit 4.12 is supposed to be built against Hamcrest 1.3 or above
but external/hamcrest is still at 1.1. This reverts affected
files back to their 4.10 version so that they will compile
against Hamcrest 1.1 for now.
Bug: 33613916
Test: make checkbuild
Change-Id: Ie3c15047aa5a942ed0987c31c345725bef4db3d4
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|
| aeb93fc33cae3aadbb9b46083350ad2dc9aea645 |
|
14-Dec-2016 |
Paul Duffin <paulduffin@google.com> |
Upgrade to JUnit 4.12
The license has changed from Common Public License v1.0 to
Eclipse Public License v1.0.
This will not compile as it is because it is intended to be
built against Hamcrest 1.3 or later but it is being built
against Hamcrest 1.1.
A follow on patch will fix the compilation errors so that it
builds against Hamcrest 1.1. That allows Hamcrest to be upgraded
separately. The patch can be reverted once Hamcrest has been
upgraded.
There are also some Android specific issues that will also be
fixed in follow on patches.
Bug: 33613916
Test: make checkbuild
Change-Id: Ic2c983a030399e3ace1a14927cb143fbd8307b4f
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|
| 4dd042caba6f0ee54f604a409df7152b3e8205bb |
|
14-Dec-2016 |
Paul Duffin <paulduffin@google.com> |
Moved source to match upstream file structure
Will make it simpler to update JUnit source.
Bug: 33613916
Test: make checkbuild
Change-Id: I76984a6defd3e40f34eea995e6ed865d32d53da3
/external/junit/src/main/java/org/junit/matchers/JUnitMatchers.java
|