aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-10Remove support for stuck threads am: 4156f43b51 am: b00f6c540dPaul Duffin
am: 47d047cb9a Change-Id: I26aec5f76480655f1dd323d4b7052e2c2c1174e2
2017-01-10Remove DisableOnDebug (new in 4.12) as it is not supported on Android am: ↵Paul Duffin
c8055484aa am: 25b39d4c9a am: 8459641eac Change-Id: I9244a1a964db8fce2d7326e2b15e27b17287552c
2017-01-10Upgrade to JUnit 4.12 am: aeb93fc33c am: 25a6c4cb46Paul Duffin
am: 43201a730c Change-Id: I637dc2574c8f78c6d6dd1f093705ac90a854d684
2017-01-10Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040fdPaul Duffin
am: 535e14398f Change-Id: Ifa4309f23af7dfd855810d5206198962805e68d3
2017-01-10Extra generic type information to aid certain javacs. am: a0b1fd6752Ian Rogers
am: 472f7143b4 Change-Id: Ia83ae1a5c53948dc520303362dd5dceb94e4bb88
2017-01-10Revert matchers back to 4.10 to compile against Hamcrest 1.1 am: 86f323b2a7Paul Duffin
am: e20af47911 Change-Id: I47dedcb6db38b18b734059193615a7f1d36ca397
2017-01-10Remove support for stuck threads am: 4156f43b51Paul Duffin
am: b00f6c540d Change-Id: I133918dba540c7bde620e8e77dddf6f251d3b611
2017-01-10Remove DisableOnDebug (new in 4.12) as it is not supported on Android am: ↵Paul Duffin
c8055484aa am: 25b39d4c9a Change-Id: I9d7b1590336e68fab9268c2c0322fa759b02a096
2017-01-10Upgrade to JUnit 4.12 am: aeb93fc33cPaul Duffin
am: 25a6c4cb46 Change-Id: I697a6612203ee0212a7588b3ebeea15c0a789b7a
2017-01-10Merge changes from topic 'upgrade-junit4.12'Paul Duffin
am: 7cfdf040fd Change-Id: I797e19f5fea35b80a6b23c294a814cf48535e4c2
2017-01-10Extra generic type information to aid certain javacs.Ian Rogers
am: a0b1fd6752 Change-Id: I35a7645531de2e1b62910b32ac92fd09c7583f95
2017-01-10Revert matchers back to 4.10 to compile against Hamcrest 1.1Paul Duffin
am: 86f323b2a7 Change-Id: I01eee1acbeddf862d36fb6284376b97ea98ba4fd
2017-01-10Remove support for stuck threadsPaul Duffin
am: 4156f43b51 Change-Id: Ic50259089a10891da7795dd893a6d32d8e7cbc47
2017-01-10Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
am: c8055484aa Change-Id: Ib56d7246b8e7cfe45b7c175657f80fdb1d725fca
2017-01-10Upgrade to JUnit 4.12Paul Duffin
am: aeb93fc33c Change-Id: I205b644f99ff5da426794918c85007de19bcb25d
2017-01-10Merge changes from topic 'upgrade-junit4.12'android-n-mr2-preview-1Paul Duffin
* changes: Extra generic type information to aid certain javacs. Revert matchers back to 4.10 to compile against Hamcrest 1.1 Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Upgrade to JUnit 4.12
2016-12-20Merge "Minor changes to JUnit 4.10 to make it more like 4.12" am: 26401927b8 ↵Paul Duffin
am: de7e697850 am: b51c910133 am: 9fbd3a0d94 Change-Id: I6bbb97856cbef29593c8ac41ce18e03cc5c9b356
2016-12-20Merge "Minor changes to JUnit 4.10 to make it more like 4.12" am: 26401927b8 ↵Paul Duffin
am: de7e697850 am: b51c910133 Change-Id: I6b57701a4817d8bd43179194cc443de70cd94ee7
2016-12-20Merge "Minor changes to JUnit 4.10 to make it more like 4.12" am: 26401927b8Paul Duffin
am: de7e697850 Change-Id: I914b9f33b8b4ba09fb71fa11f4e71994a12c276d
2016-12-20Merge "Minor changes to JUnit 4.10 to make it more like 4.12"Paul Duffin
am: 26401927b8 Change-Id: If4350a64fcf559a513154178bd74eca9fdd5b5b6
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-20Merge "Minor changes to JUnit 4.10 to make it more like 4.12"Paul Duffin
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-16Merge "Remove reference to deleted file Common.mk" am: 8f7a4bf103 am: ↵Paul Duffin
3257b32ae5 am: 4f6c59f4d3 am: 6b815ae560 Change-Id: I7fe1cebfc2c790e94391690ebcd6542e63decf74
2016-12-16Merge "Remove reference to deleted file Common.mk" am: 8f7a4bf103 am: 3257b32ae5Paul Duffin
am: 4f6c59f4d3 Change-Id: Ief5d910cf09204ebee5132911d5da3a39d48a4da
2016-12-16Merge "Remove reference to deleted file Common.mk" am: 8f7a4bf103Paul Duffin
am: 3257b32ae5 Change-Id: I4b13e1366dd58bdc2444aa259531f6aaf9ffc972
2016-12-16Merge "Remove reference to deleted file Common.mk"Paul Duffin
am: 8f7a4bf103 Change-Id: I0e19cf1eca17fa9ba3682a838cdb3ab863f771af
2016-12-16Merge "Remove reference to deleted file Common.mk"Paul Duffin
2016-12-16Merge "Fix build.gradle file" am: e0039d8613 am: f4e9b7c834 am: 0444957ac3Paul Duffin
am: c8f84aac0c Change-Id: I29a1fb2f8c31b7bc1d0057648ce3c68dfb7e8929
2016-12-16Merge "Fix build.gradle file" am: e0039d8613 am: f4e9b7c834Paul Duffin
am: 0444957ac3 Change-Id: I455faf963dbceb4c23a48d668d32e9b8f8faa06b
2016-12-16Merge "Fix build.gradle file" am: e0039d8613Paul Duffin
am: f4e9b7c834 Change-Id: I66aeebbe9e1d1674f47ac3ea99831e2fab9a0de4
2016-12-16Merge "Fix build.gradle file"Paul Duffin
am: e0039d8613 Change-Id: Ib1f4f170c8f939c390c22b9766e720d6e94d9bc7
2016-12-16Merge "Fix build.gradle file"Paul Duffin
2016-12-16Fix build.gradle filePaul Duffin
Bug: 33613916 Test: Cannot determine how to test it Change-Id: Ic47ec6bd212b97ee8c5d0c3146027eb65b86e5a7
2016-12-16Merge "Moved source to match upstream file structure" am: 7d62b5836f am: ↵Paul Duffin
7c60256c23 am: e3cfd1fac3 am: 7da76d1a87 Change-Id: If4e7b4d728f0ae71645f3124699c226b73d31e19
2016-12-16Merge "Moved source to match upstream file structure" am: 7d62b5836f am: ↵Paul Duffin
7c60256c23 am: e3cfd1fac3 Change-Id: I911263d49aa453ca181812b05f5b6222c81e5674
2016-12-16Merge "Moved source to match upstream file structure" am: 7d62b5836fPaul Duffin
am: 7c60256c23 Change-Id: I471843ee7d264fd2deae81772d9f85879deb8153
2016-12-16Merge "Moved source to match upstream file structure"Paul Duffin
am: 7d62b5836f Change-Id: Ic210a14f272e8c8a08b78edc2e5bc6e570309df8
2016-12-16Merge "Moved source to match upstream file structure"Paul Duffin
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
2016-12-15Remove reference to deleted file Common.mkPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: Iafbfb02709f33a9de12d3d6c3d8dff2cc73f1efa
2016-12-15Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: ↵Paul Duffin
50db5f5810 am: 38d1882ee2 am: e0df57581a am: 87fef242a9 Change-Id: Icf0ccba66c16e4c6bee5d47529f00a27e2a0aece
2016-12-15Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: ↵Paul Duffin
50db5f5810 am: 38d1882ee2 am: e0df57581a Change-Id: I4016437334f02a093d15f8c0dc0d3f39039d7f43
2016-12-15Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: ↵Paul Duffin
50db5f5810 am: 38d1882ee2 Change-Id: Ieec0b3b57fea9d34ca438c8588c8e3003f64341a
2016-12-15Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10"Paul Duffin
am: 50db5f5810 Change-Id: I485d2415f37257a89e5f37f84014c77e11be3ad4
2016-12-15Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10"Paul Duffin
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 03:12:05 +0000