aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/junit/Assume.java
AgeCommit message (Collapse)Author
2021-03-02Upgrade external/junit to 4.13.2Pete Bentley
Contains just the changes from 4.12 to 4.13.2 and undoes local Android changes. Will re-patch those in in subsequent CLs. This change re-lands https://r.android.com/1598413. Bug: 129054170 Test: m Change-Id: I6135799c8be5db2ec4c3f13951c18c072427e30d
2021-02-24Revert "Upgrade external/junit to 4.13.2"David Srbecky
Revert submission 1601635 Reason for revert: b/181123058 Reverted Changes: I8f5cd1266:Remove support for stuck threads Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s... I6abae5aed:Extra generic type information to aid certain java... I5ec909df6:Upgrade external/junit to 4.13.2 Change-Id: Idaddfc2039816a8d7b12c91fdd540b801ab854ff
2021-02-22Upgrade external/junit to 4.13.2Pete Bentley
Contains just the changes from 4.12 to 4.13.2 and undoes local Android changes. Will re-patch those in in subsequent CLs. Bug: 129054170 Test: m Change-Id: I5ec909df6840f6c54cbab9c509c5addaee3f94e6
2017-01-23Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"Paul Duffin
This reverts commit 86f323b2a73c9c250fbe25b828435aa936704ab3. Bug: 30946317 Test: make checkbuild Change-Id: Ie72fec656d01f24a1724d33a35ceecdb57aaba57
2016-12-20Revert matchers back to 4.10 to compile against Hamcrest 1.1Paul Duffin
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
2016-12-20Upgrade to JUnit 4.12Paul Duffin
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
2016-12-15Moved source to match upstream file structurePaul Duffin
Will make it simpler to update JUnit source. Bug: 33613916 Test: make checkbuild Change-Id: I76984a6defd3e40f34eea995e6ed865d32d53da3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:17:48 +0000