opendev/gerrit
Code Issues Proposed changes

Revert "Allow tests to use hamcrest matchers directly"

Browse Source 
This reverts commit 2efc3e7efb.

It's no longer necessary to use the hamcrest matchers since we
have the Google Truth library.

Change-Id: Ib2cddfc52b3eeef4721b263ea1d693f45ac3cf15
This commit is contained in:
David Pursehouse 2014-11-12 21:59:23 +09:00
parent 7e55072682
commit c391278b1c
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/BUCK
View File

@ -28,8 +28,6 @@ java_library(
'//lib:servlet-api-3_1', '//lib:servlet-api-3_1',
'//lib:truth', '//lib:truth',
'//lib/hamcrest:hamcrest-core',
'//lib/hamcrest:hamcrest-library',
'//lib/httpcomponents:httpclient', '//lib/httpcomponents:httpclient',
'//lib/httpcomponents:httpcore', '//lib/httpcomponents:httpcore',
'//lib/log:impl_log4j', '//lib/log:impl_log4j',

10
lib/BUCK
View File

@ -175,7 +175,15 @@ maven_jar(
id = 'junit:junit:4.10', id = 'junit:junit:4.10',
sha1 = 'e4f1766ce7404a08f45d859fb9c226fc9e41a861', sha1 = 'e4f1766ce7404a08f45d859fb9c226fc9e41a861',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = ['//lib/hamcrest:hamcrest-core'], deps = [':hamcrest-core'],
)
maven_jar(
name = 'hamcrest-core',
id = 'org.hamcrest:hamcrest-core:1.3',
sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib:junit'],
) )
maven_jar( maven_jar(

25
lib/hamcrest/BUCK
View File

@ -1,25 +0,0 @@
include_defs('//lib/maven.defs')
VERSION = '1.3'
maven_jar(
name = 'hamcrest-core',
id = 'org.hamcrest:hamcrest-core:' + VERSION,
sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
license = 'DO_NOT_DISTRIBUTE',
visibility = [
'//lib:junit',
'//gerrit-acceptance-tests:lib'
],
)
maven_jar(
name = 'hamcrest-library',
id = 'org.hamcrest:hamcrest-library:' + VERSION,
sha1 = '4785a3c21320980282f9f33d0d1264a69040538f',
license = 'DO_NOT_DISTRIBUTE',
visibility = [
'//lib:junit',
'//gerrit-acceptance-tests:lib'
],
)