aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
AgeCommit message (Collapse)Author
2021-03-02Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
It makes more sense to pass assumption failures through this path unchanged (unlike ErrorCollector.checkSucceeds) and converting them to errors breaks tests which use ErrorCollector in a wrapper Rule. Upstream issue: https://github.com/junit-team/junit4/issues/1703 Bug: 129054170 Test: m checkbuild Change-Id: I578a2676e52882c7d25d99061310ea38101883f6
2021-03-02Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. This change re-lands https://r.android.com/1601635 Bug: 129054170 Test: m checkbuild Change-Id: I4b37c2d09b5c68afde438c343b41fcdc788c578e (cherry picked from commit 4156f43b51c6f2d42df6e45535e1967aa46514d3)
2021-03-02Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. This change re-lands https://r.android.com/1601634 Bug: 129054170 Test: m Change-Id: Id1e2d63892e25026f68f9a345d788e2e7497e737 (cherry picked from commit c8055484aac0d002d00140b789711414f4130428)
2021-03-02Extra generic type information to aid certain javacs.Pete Bentley
In particular this is needed for the code to compile using the error prone analyzer. This change re-lands https://r.android.com/1601633 Bug: 129054170 Test: m Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc (cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
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-24Revert "Extra generic type information to aid certain javacs."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: Ic641a09a2f6e661e2f466941123e74aba0ac4dac
2021-02-24Revert "Remove DisableOnDebug (new in 4.12) as it is not support..."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: I464bf4512b5e19f37ba69ac42a5e9c22f61bc7d1
2021-02-24Revert "Remove support for stuck threads"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: Icf0a7b88b0004e60cd4139cb10be62af5bdc68d2
2021-02-23Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m checkbuild Change-Id: I8f5cd12661c1559a3d144858a5a8a742e5adba9e (cherry picked from commit 4156f43b51c6f2d42df6e45535e1967aa46514d3)
2021-02-23Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m Change-Id: Ifdb59336df4a4695d1f873755daa02d6042775c6 (cherry picked from commit c8055484aac0d002d00140b789711414f4130428)
2021-02-23Extra generic type information to aid certain javacs.Pete Bentley
In particular this is needed for the code to compile using the error prone analyzer. Bug: 129054170 Test: m Change-Id: I6abae5aedc567d3c6a991046551b62a08a8b3337 (cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
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-25Allow JUnit to compile against external/hamcrest v2.0Paul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: Idbeddca3346d43ed39cdbb0c6e44779b54f981a4
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-20Extra generic type information to aid certain javacs.Ian Rogers
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
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-20Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. Bug: 33613916 Test: make checkbuild Change-Id: I0146a9881f34f6da8f8f24c1ab14131e32733465
2016-12-20Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. Bug: 33613916 Test: make checkbuild - fails but not in DisableOnDebug Change-Id: If43a90d1dde7d3c2141001bcc7cb33c3c2b3964c
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-19Minor changes to JUnit 4.10 to make it more like 4.12Paul Duffin
Some other projects break when built against 4.12. This allows those projects to be updated separately to the JUnit 4.12 upgrade. Assert.java and Description.java are copied directly from upstream 4.12; that brings in new methods from 4.12. The changes are so extensive because the upstream code was reformatted between 4.10 anbd 4.12. Between 4.10 and 4.12 RuleFieldValidator.java was renamed to RuleMemberValidator.java. To allow existing code that uses RuleFieldValidator to be modified to use RuleMemberValidator instead RuleFieldValidator.java has been copied to RuleMemberValidator.java. The change to BlockJUnit4ClassRunner reflects an upstream change made between 4.10 and 4.12. Bug: 33613916 Test: make checkbuild Change-Id: Id8ee6d08268152ec1a22a309c4582f8f6663ae88
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 17:39:23 +0000