Age | Commit message (Collapse) | Author |
|
f8a5acaa27 am: 1883487014 am: 5fa2966197
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553
Change-Id: Idf8518218ace6959ab4c8a3a99af411b39dd83ed
|
|
f8a5acaa27 am: 1883487014
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553
Change-Id: Ib68c8fbb323e6056fdd9f8f7071ab94689ea2564
|
|
f8a5acaa27
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553
Change-Id: I62a55a9d769789469f2bcacd1ed481069eab0b0b
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553
Change-Id: If5149fcbc30c5fb5853d9a9393142e2d2738a38f
|
|
|
|
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
|
|
addee62da9 -s ours am: 3b0fa394e8 -s ours am: 9b3a981a03 -s ours am: a92f311e22 -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: I7e27e26a6ce97068b402f2d9d6940537a55b5fbd
|
|
addee62da9 -s ours am: 3b0fa394e8 -s ours am: 9b3a981a03 -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: I94fc8875a0cb8c3280acb57e3b73065f4aaa5242
|
|
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
|
|
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
|
|
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
|
|
|
|
Bug: 202323961
Merged-In: I50fd827167ac7459594e2b5e9ceb98607ee26fb3
Change-Id: I532df5c1340d53dc35ab6e512ec31458e173d5c4
|
|
e015857610 -s ours am: 415e8883f5 -s ours am: efe9bb63cf -s ours am: de440f6a5d -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: Idf7afac3d9d286442002453b9cceabb32fa8a023
|
|
e015857610 -s ours am: 415e8883f5 -s ours am: efe9bb63cf -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: Idbcafa5f0798ae40ed11593e11aea0c3328f51a7
|
|
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
|
|
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
|
|
Merged-In: I9f46bd63b05b162864a19eef3588951fea8940d8
Change-Id: I50fd827167ac7459594e2b5e9ceb98607ee26fb3
|
|
Bug: 189946434
Change-Id: I85d176ea87d4de97025e1603e87a8c2a860ec3b8
|
|
ErrorCollector.addError(). am: ccf3392c72 -s ours am: 7114aba399 -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: If3150b4e7e7e231db54d7e57f5859ad11f0304da
|
|
am: 527b249dca -s ours
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: I6db12131f7bb877e9ba190feaf24e016ce8077e4
|
|
supported on Android am: 878a3ac7a7 -s ours am: 87733b3f18 -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: I5542b8e9ecc29bea7abb4cd5c93027e223891b6f
|
|
am: 3f98e79978 -s ours am: 26a8efce71 -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: I5cf9923b5d2ab7f98923bacde799479ea5fdc3f8
|
|
am: f26431852e -s ours
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: I29caa2b3d862b19f6901fcdfd7de34cb78d2170f
|
|
ErrorCollector.addError(). am: ccf3392c72 -s ours am: 7114aba399 -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: Ib9937440eb367103cd20451980e751bc9ca54c54
|
|
am: 527b249dca -s ours
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: I9c7153113e5c66904d04f9ef15df86d4b07328c6
|
|
supported on Android am: 878a3ac7a7 -s ours am: 87733b3f18 -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: I0fdb03f5de8cc3f135690098b6d2269793e2275d
|
|
am: 3f98e79978 -s ours am: 26a8efce71 -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: I0ef8d0e201d8f183aae3a7c42f68d54cb1a9b37a
|
|
am: f26431852e -s ours
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: Ic8558b8407861ef0ec843fed8ad70cddbdc352d9
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
e4c0069c95 am: d4fa0ece31
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib9d82d24ea1eb3ac9889307d8ac92b2d59d5200a
|
|
e4c0069c95 am: d4fa0ece31
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3b2b22be255199b6247ad6dd53147bf4ba3368d
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4fa316f2ae4844ef588541940d76e835c8291cf
|
|
b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d am: a9a7715d84
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70a6b61e69982b66be9f6d7c2e7df5afc91bf382
|
|
b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d am: a9a7715d84
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I56f45d05317bd1060b5838f1ada3a90bb2985d55
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c0cc83e4c0a64217ecf29cbfd11d74bcdbf4563
|
|
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
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie451b647086796b29102ccef18fa2bfb32146ca6
|
|
|
|
b6446bec0a am: fcd81b3e3f
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide8f718358c2b88fb4af0b2b2792f5a560de4d67
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88041ad8242f07c65db7bbc3b8167363b604af63
|