aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-24Merge "Disable errorprone's DoNotCall check in junit" am: 06d093120dandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553 Change-Id: If5149fcbc30c5fb5853d9a9393142e2d2738a38f
2021-11-24Merge "Disable errorprone's DoNotCall check in junit"Treehugger Robot
2021-11-23Disable errorprone's DoNotCall check in junitCole Faust
Junit call some methods that always throw an exception, and errorprone's DoNotCall checker enforces that these methods aren't called. Disable the DoNotCall checker for this module. Bug: 190944875 Test: Presubmits Change-Id: I3b97ae9e02b36b5f05b407691d67e260a67000e9
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am: 3b0fa394e8 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I748b0994678e573a87bf51797683ad56356f4977
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I4a102a75a39a5ab5debe8db5e86f8faabab3482e
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s oursXin Li
am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I9247911d2967283dc8123b0e0901849a3655847f
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I50fd827167ac7459594e2b5e9ceb98607ee26fb3 Change-Id: I532df5c1340d53dc35ab6e512ec31458e173d5c4
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am: 415e8883f5 -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: I0f231f0f03271fcb5595cc2b93f68d1cc983d4f0
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: I64914a5a1222223133b4c0a93c424e74b617cc8f
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I9f46bd63b05b162864a19eef3588951fea8940d8 Change-Id: I50fd827167ac7459594e2b5e9ceb98607ee26fb3
2021-03-11[automerger skipped] Don't convert assumption failures into errors in ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releasePete Bentley
ErrorCollector.addError(). am: ccf3392c72 -s ours am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f46bd63b05b162864a19eef3588951fea8940d8
2021-03-11[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s oursPaul Duffin
am skip reason: Change-Id I4b37c2d09b5c68afde438c343b41fcdc788c578e with SHA-1 adac35f1ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c57c41a159d5b7554f80284e7815cece47a5a33
2021-03-11[automerger skipped] Remove DisableOnDebug (new in 4.12) as it is not ↵Paul Duffin
supported on Android am: 878a3ac7a7 -s ours am skip reason: Change-Id Id1e2d63892e25026f68f9a345d788e2e7497e737 with SHA-1 77cf67c410 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799494 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I825cf713ca908ac52d20128bcf55635a0ea893d5
2021-03-11[automerger skipped] Extra generic type information to aid certain javacs. ↵Pete Bentley
am: 3f98e79978 -s ours am skip reason: Change-Id I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc with SHA-1 75dd2ceb50 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799493 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieedaf1e03c1ccc50c14a8ff715fadffd1c5ae67a
2021-03-11[automerger skipped] Upgrade external/junit to 4.13.2 am: 1f76da989f -s oursPete Bentley
am skip reason: Change-Id I6135799c8be5db2ec4c3f13951c18c072427e30d with SHA-1 8e80a2a7b8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65279b7f289ac8d087537c6127d61f1001623cf9
2021-03-08Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
Cherry-picking to mainline-prod for consistency with other branches. 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 Merged-In: I578a2676e52882c7d25d99061310ea38101883f6 (cherry picked from commit d3857e49835c77c9f8000af18904d05b43b24ce1)
2021-03-08Remove support for stuck threadsPaul Duffin
Cherry-picking to mainline-prod for consistency with other branches. 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: I4b37c2d09b5c68afde438c343b41fcdc788c578e Merged-In: I4b37c2d09b5c68afde438c343b41fcdc788c578e (cherry picked from commit adac35f1ea1f9987d9843236991ad4120e704bcb)
2021-03-08Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
Cherry-picking to mainline-prod for consistency with other branches. It requires classes from the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m Change-Id: Id1e2d63892e25026f68f9a345d788e2e7497e737 Merged-In: Id1e2d63892e25026f68f9a345d788e2e7497e737 (cherry picked from commit 77cf67c410a013f5e33dc7b333a614f7e1b5ac66)
2021-03-08Extra generic type information to aid certain javacs.Pete Bentley
Cherry-picking to mainline-prod for consistency with other branches. In particular this is needed for the code to compile using the error prone analyzer. Bug: 129054170 Test: m Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc Merged-In: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc (cherry picked from commit 75dd2ceb505380a918bec2cb3d3096a6b362574c)
2021-03-08Upgrade external/junit to 4.13.2Pete Bentley
Cherry-picking to mainline-prod for consistency with other branches. 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: I6135799c8be5db2ec4c3f13951c18c072427e30d Merged-In: I6135799c8be5db2ec4c3f13951c18c072427e30d (cherry picked from commit 8e80a2a7b89329f95cb41e8b2981044362478c04)
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2 am: 771e70cdf1 am: e4c0069c95Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4fa316f2ae4844ef588541940d76e835c8291cf
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2 am: 771e70cdf1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c0cc83e4c0a64217ecf29cbfd11d74bcdbf4563
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: ↵Pete Bentley
b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1a9bf8405e1b57da206312f5694e8c3ff5ce613
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie451b647086796b29102ccef18fa2bfb32146ca6
2021-03-03Merge "Add prb to junit OWNERS."android-s-beta-2android-s-beta-1Treehugger Robot
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: ↵Pete Bentley
b6446bec0a am: fcd81b3e3f Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ide8f718358c2b88fb4af0b2b2792f5a560de4d67
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0aPete Bentley
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88041ad8242f07c65db7bbc3b8167363b604af63
2021-03-03Add prb to junit OWNERS.Pete Bentley
Test: n/a Change-Id: I8ae0ade50e82fec4b53451e46b8ffa29ba4f3e20
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799cPete Bentley
* changes: Don't convert assumption failures into errors in ErrorCollector.addError(). Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Extra generic type information to aid certain javacs. Upgrade external/junit to 4.13.2
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-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 am: 91c5e5ff9d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa51f5a85f96ec87a01eff9bc98e2274fc5a97dd
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I443f57dd29ed2557b7733b1f3e51718d5d6a2af4
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281David Srbecky
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b6b1c8147b46e6c2a0ebd81a22edbb370082ded
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP"David Srbecky
* changes: Revert "Upgrade external/junit to 4.13.2" Revert "Extra generic type information to aid certain javacs." Revert "Remove DisableOnDebug (new in 4.12) as it is not support..." Revert "Remove support for stuck threads"
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-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 am: 82af4b8b1d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib180e48a4cc266c12a2d9238385adbb07540d3dc
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib00d0e3bda09315496b61b51b207bd8981c947e7
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357Pete Bentley
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I05d47d7655c50db318c4060118dfcd98af542a45
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909dfPete Bentley
* changes: Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Extra generic type information to aid certain javacs. Upgrade external/junit to 4.13.2
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 06:30:10 +0000