Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Issue 2076783004: Changes to update Junit and Mockito. (Closed)

Created:
4 years, 6 months ago by mikecase (-- gone --)
Modified:
4 years, 4 months ago
CC:
cbentzel+watch_chromium.org, chromium-reviews, feature-media-reviews_chromium.org, media-router+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Changes to update Junit and Mockito. Updating Junit from 4.10 to 4.12 Updating Mockito from 1.10.5 to 2.0.99-beta This change is mostly motivated to make it so we only have 1 version of third_party libraries in Chromium. Junit 4.12, Mockito 2.0.99-beta, and Espresso and Robolectric 3.0 all depend on Hamcrest 1.3. Some build errors occur when building Espresso tests currently due to multiple versions of Hamcrest in the dependency tree. Additionally, its just nice to update these libraries since they are several years old. BUG=620897 Committed: https://crrev.com/d5d3a70e2b63a9714e275b0e28960e349312b0d2 Cr-Commit-Position: refs/heads/master@{#413191}

Patch Set 1 #

Patch Set 2 : Update all the junit tests. #

Patch Set 3 : Changes to update Junit and Mockito. #

Total comments: 2

Patch Set 4 : Added casts needed for Java7 #

Patch Set 5 : Fixed java 7 compile error. #

Patch Set 6 : Fixed failing webapk junit tests. #

Patch Set 7 : Rebase #

Patch Set 8 : Adding myself to junit OWNERS #

Unified diffs Side-by-side diffs Delta from patch set Stats (+512 lines, -493 lines) Patch
M DEPS View 1 2 3 4 5 6 1 chunk +2 lines, -2 lines 0 comments Download
M base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java View 1 2 3 4 5 6 1 chunk +1 line, -2 lines 0 comments Download
M chrome/android/BUILD.gn View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/ChromeBackupAgentTest.java View 1 2 3 4 5 6 1 chunk +2 lines, -1 line 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java View 1 2 3 2 chunks +6 lines, -5 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.java View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java View 1 2 3 4 5 6 1 chunk +4 lines, -4 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java View 1 2 3 6 chunks +12 lines, -12 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java View 1 2 3 4 5 6 3 chunks +4 lines, -4 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/JSONTestUtils.java View 1 4 chunks +10 lines, -11 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java View 1 2 3 4 5 6 1 chunk +4 lines, -4 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java View 1 2 3 4 5 6 2 chunks +4 lines, -3 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridgeTest.java View 1 2 3 4 5 6 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java View 1 2 3 4 5 6 1 chunk +4 lines, -4 lines 0 comments Download
M chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java View 1 2 3 4 5 6 1 chunk +3 lines, -2 lines 0 comments Download
M components/policy/android/BUILD.gn View 1 1 chunk +1 line, -1 line 0 comments Download
M components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java View 1 2 3 4 5 6 3 chunks +7 lines, -6 lines 0 comments Download
M components/policy/android/junit/src/org/chromium/policy/CombinedPolicyProviderTest.java View 1 2 3 4 1 chunk +5 lines, -5 lines 0 comments Download
M components/policy/android/junit/src/org/chromium/policy/test/annotations/PoliciesTest.java View 1 2 3 4 2 chunks +2 lines, -1 line 0 comments Download
M components/web_restrictions/BUILD.gn View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M components/web_restrictions/browser/junit/src/org/chromium/components/webrestrictions/browser/WebRestrictionsClientTest.java View 1 2 3 4 5 6 7 3 chunks +10 lines, -12 lines 0 comments Download
M components/web_restrictions/browser/junit/src/org/chromium/components/webrestrictions/browser/WebRestrictionsContentProviderTest.java View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M net/android/BUILD.gn View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java View 1 2 3 4 5 6 11 chunks +42 lines, -59 lines 0 comments Download
M third_party/hamcrest/BUILD.gn View 1 1 chunk +2 lines, -2 lines 0 comments Download
M third_party/junit/BUILD.gn View 1 2 3 10 chunks +40 lines, -13 lines 0 comments Download
M third_party/junit/OWNERS View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M third_party/junit/README.chromium View 1 chunk +1 line, -1 line 0 comments Download
M third_party/mockito/BUILD.gn View 1 1 chunk +334 lines, -327 lines 0 comments Download
M third_party/mockito/README.chromium View 1 2 1 chunk +2 lines, -2 lines 0 comments Download

Messages

Total messages: 30 (12 generated)
mikecase (-- gone --)
+jbudorick and yolandyan for fyi. Do not need to review yet since we will need ...
4 years, 6 months ago (2016-06-17 19:08:29 UTC) #2
mikecase (-- gone --)
Updated all the junit tests that were using hamcrest. Almost all of the updates that ...
4 years, 4 months ago (2016-08-11 23:06:00 UTC) #4
jbudorick
compile doesn't appear to be too happy with this version. https://codereview.chromium.org/2076783004/diff/40001/third_party/junit/BUILD.gn File third_party/junit/BUILD.gn (right): https://codereview.chromium.org/2076783004/diff/40001/third_party/junit/BUILD.gn#newcode104 ...
4 years, 4 months ago (2016-08-15 15:48:38 UTC) #5
mikecase (-- gone --)
yeah, for some reason everything compiled and worked locally, but not on the bot. All ...
4 years, 4 months ago (2016-08-15 16:11:33 UTC) #6
mikecase (-- gone --)
On 2016/08/15 at 16:11:33, mikecase wrote: > yeah, for some reason everything compiled and worked ...
4 years, 4 months ago (2016-08-15 16:40:05 UTC) #7
mikecase (-- gone --)
+ thestig@chromium.org for review of base/ and chrome/ + bartfab@chromium.org for review of components/policy/ + ...
4 years, 4 months ago (2016-08-15 23:05:28 UTC) #10
Lei Zhang
On 2016/08/15 23:05:28, mikecase wrote: > + mailto:thestig@chromium.org for review of base/ and chrome/ Please ...
4 years, 4 months ago (2016-08-15 23:09:45 UTC) #11
mikecase (-- gone --)
+ nyquist@chromium.org for review of base/android and chrome/android
4 years, 4 months ago (2016-08-15 23:11:41 UTC) #13
nyquist
base/android, chrome/android lgtm
4 years, 4 months ago (2016-08-15 23:49:32 UTC) #15
bartfab (slow)
components/policy LGTM
4 years, 4 months ago (2016-08-16 08:11:57 UTC) #16
aberent
lgtm
4 years, 4 months ago (2016-08-16 08:23:55 UTC) #17
cbentzel
net LGTM
4 years, 4 months ago (2016-08-18 03:19:58 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2076783004/120001
4 years, 4 months ago (2016-08-19 16:48:36 UTC) #21
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/241917)
4 years, 4 months ago (2016-08-19 16:55:44 UTC) #23
jbudorick
lgtm
4 years, 4 months ago (2016-08-19 17:09:56 UTC) #24
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2076783004/140001
4 years, 4 months ago (2016-08-19 17:18:29 UTC) #27
commit-bot: I haz the power
Committed patchset #8 (id:140001)
4 years, 4 months ago (2016-08-19 18:27:51 UTC) #28
commit-bot: I haz the power
4 years, 4 months ago (2016-08-19 18:30:17 UTC) #30
Message was sent while issue was closed.
Patchset 8 (id:??) landed as
https://crrev.com/d5d3a70e2b63a9714e275b0e28960e349312b0d2
Cr-Commit-Position: refs/heads/master@{#413191}

Powered by Google App Engine
This is Rietveld 408576698