|
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}
Total comments: 2
|
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
|
Total messages: 30 (12 generated)
|