Allow third_party/java_src/gtld/ to use :mockito2_for_third_party

In [] a change would have been made to your project that is incompatible with
your open source integration. To make sure the open source variant of your
project remains working, we have eagerly updated your open source copy to use
Mockito 2. This CL integrates that change into [].

Please read []and
understand the consequences of this change.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=238445356
This commit is contained in:
Ben McIlwain 2019-03-14 08:16:18 -07:00
parent 1a6c068471
commit 202ed9db6a
70 changed files with 200 additions and 199 deletions

View file

@ -25,7 +25,7 @@ dependencies {
annotationProcessor deps['com.google.auto.value:auto-value']
testCompile deps['com.google.truth:truth']
testCompile deps['com.google.truth.extensions:truth-java8-extension']
testCompile deps['org.mockito:mockito-all']
testCompile deps['org.mockito:mockito-core']
}
gradle.projectsEvaluated {

View file

@ -268,7 +268,7 @@ dependencies {
testCompile deps['org.hamcrest:hamcrest-core']
testCompile deps['org.hamcrest:hamcrest-library']
testCompile deps['junit:junit']
testCompile deps['org.mockito:mockito-all']
testCompile deps['org.mockito:mockito-core']
// Indirect dependency found by undeclared-dependency check. Such
// dependencies should go after all other compile and testCompile

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -160,6 +159,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -181,14 +182,14 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -158,6 +157,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -179,14 +180,14 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -2,7 +2,6 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
args4j:args4j:2.0.26
cglib:cglib-nodep:2.2
com.google.closure-stylesheets:closure-stylesheets:1.5.0
com.google.code.findbugs:jsr305:3.0.1
com.google.code.gson:gson:2.7
@ -11,8 +10,9 @@ com.google.javascript:closure-compiler-externs:v20160713
com.google.javascript:closure-compiler-unshaded:v20160713
com.google.protobuf:protobuf-java:2.5.0
javacc:javacc:4.1
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
net.java.dev.javacc:javacc:4.1
org.easymock:easymock:3.0
org.hamcrest:hamcrest-core:1.1
org.mockito:mockito-core:1.10.19
org.objenesis:objenesis:2.1
org.easymock:easymock:3.5
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -167,7 +166,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -201,17 +201,16 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-all:1.3
org.hamcrest:hamcrest-core:1.3
org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -165,7 +164,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -199,17 +199,16 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-all:1.3
org.hamcrest:hamcrest-core:1.3
org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -134,7 +134,7 @@ ext {
'org.joda:joda-money:0.10.0',
'org.json:json:20160810',
'org.khronos:opengl-api:gl1.1-android-2.1_r1',
'org.mockito:mockito-all:1.10.19',
'org.mockito:mockito-core:2.25.0',
'org.mortbay.jetty:jetty:6.1.26',
'org.mortbay.jetty:jetty-util:6.1.26',
'org.seleniumhq.selenium:selenium-api:3.141.59',

View file

@ -63,7 +63,7 @@ dependencies {
testCompile deps['com.google.truth:truth']
testCompile deps['org.yaml:snakeyaml']
testCompile deps['junit:junit']
testCompile deps['org.mockito:mockito-all']
testCompile deps['org.mockito:mockito-core']
testCompile project(':third_party')
testCompile project(path: ':core', configuration: 'testRuntime')

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -168,7 +167,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -202,7 +202,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -212,11 +212,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -21,7 +21,7 @@ dependencies {
testCompile deps['junit:junit']
testCompile deps['org.hamcrest:hamcrest-all']
testCompile deps['org.hamcrest:hamcrest-core']
testCompile deps['org.mockito:mockito-all']
testCompile deps['org.mockito:mockito-core']
testCompile files("${rootDir}/../third_party/objectify/v4_1/objectify-4.1.3.jar")
testCompile project(':third_party')
testCompile project(path: ':core', configuration: 'testRuntime')

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -168,7 +167,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -202,7 +202,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -212,11 +212,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0

View file

@ -130,6 +130,7 @@ def domain_registry_repositories(
omit_jline = False,
omit_joda_time = False,
omit_junit = False,
omit_net_bytebuddy = False,
omit_org_apache_avro = False,
omit_org_apache_beam_runners_direct_java = False,
omit_org_apache_beam_runners_google_cloud_dataflow_java = False,
@ -158,7 +159,7 @@ def domain_registry_repositories(
omit_org_joda_money = False,
omit_org_json = False,
omit_org_khronos_opengl_api = False,
omit_org_mockito_all = False,
omit_org_mockito_core = False,
omit_org_mortbay_jetty = False,
omit_org_mortbay_jetty_servlet_api = False,
omit_org_mortbay_jetty_util = False,
@ -383,6 +384,8 @@ def domain_registry_repositories(
joda_time()
if not omit_junit:
junit()
if not omit_net_bytebuddy:
net_bytebuddy()
if not omit_org_apache_avro:
org_apache_avro()
if not omit_org_apache_beam_runners_direct_java:
@ -439,8 +442,8 @@ def domain_registry_repositories(
org_json()
if not omit_org_khronos_opengl_api:
org_khronos_opengl_api()
if not omit_org_mockito_all:
org_mockito_all()
if not omit_org_mockito_core:
org_mockito_core()
if not omit_org_mortbay_jetty:
org_mortbay_jetty()
if not omit_org_mortbay_jetty_servlet_api:
@ -2065,6 +2068,17 @@ def junit():
exports = ["@org_hamcrest_core"],
)
def net_bytebuddy():
java_import_external(
name = "net_bytebuddy",
jar_sha256 = "69a9140c11de463789a1badfe6c3dcdc17608c4304cb443c5c3a179585b78b39",
jar_urls = [
"http://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.9.7/byte-buddy-1.9.7.jar",
],
licenses = ["notice"], # Apache 2
testonly_ = True,
)
def org_apache_avro():
java_import_external(
name = "org_apache_avro",
@ -2495,16 +2509,19 @@ def org_khronos_opengl_api():
],
)
def org_mockito_all():
def org_mockito_core():
java_import_external(
name = "org_mockito_all",
jar_sha256 = "d1a7a7ef14b3db5c0fc3e0a63a81b374b510afe85add9f7984b97911f4c70605",
name = "org_mockito_core",
jar_sha256 = "28028d70cc27d61442948fcb3d249d9df5b37c47aa0b82490a3d049094ff411f",
jar_urls = [
"http://maven.ibiblio.org/maven2/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar",
"http://repo1.maven.org/maven2/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar",
"http://maven.ibiblio.org/maven2/org/mockito/mockito-core/2.25.0/mockito-core-2.25.0.jar",
"http://repo1.maven.org/maven2/org/mockito/mockito-core/2.25.0/mockito-core-2.25.0.jar",
],
licenses = ["notice"], # The MIT License
testonly_ = True,
deps = [
"@net_bytebuddy",
],
exports = ["@org_hamcrest_all", "@org_hamcrest_library"],
)

View file

@ -17,7 +17,6 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -29,6 +28,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -18,7 +18,6 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_api_stubs",
@ -39,6 +38,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -13,7 +13,6 @@ java_library(
deps = [
"//java/google/registry/beam",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_dagger",
"@com_google_guava",
"@com_google_truth",
@ -24,6 +23,7 @@ java_library(
"@org_apache_beam_runners_google_cloud_dataflow_java",
"@org_apache_beam_sdks_java_core",
"@org_apache_beam_sdks_java_io_google_cloud_platform",
"@org_mockito_core",
],
)

View file

@ -15,7 +15,6 @@ java_library(
"//java/google/registry/beam/invoicing",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_bigquery",
"@com_google_dagger",
"@com_google_guava",
@ -27,6 +26,7 @@ java_library(
"@org_apache_beam_runners_google_cloud_dataflow_java",
"@org_apache_beam_sdks_java_core",
"@org_apache_beam_sdks_java_io_google_cloud_platform",
"@org_mockito_core",
],
)

View file

@ -14,7 +14,6 @@ java_library(
"//java/google/registry/beam/spec11",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_dagger",
"@com_google_guava",
"@com_google_truth",
@ -28,6 +27,7 @@ java_library(
"@org_apache_httpcomponents_httpclient",
"@org_apache_httpcomponents_httpcore",
"@org_json",
"@org_mockito_core",
],
)

View file

@ -15,7 +15,6 @@ java_library(
"//java/google/registry/bigquery",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_bigquery",
"@com_google_guava",
"@com_google_http_client",
@ -23,6 +22,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -22,7 +22,6 @@ java_library(
"//java/google/registry/request/lock",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_api_stubs",
@ -33,6 +32,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -15,7 +15,6 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_dns",
"@com_google_guava",
@ -23,6 +22,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -14,7 +14,6 @@ java_library(
"//java/google/registry/dns/writer/dnsupdate",
"//java/google/registry/model",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_dagger",
"@com_google_guava",
@ -23,6 +22,7 @@ java_library(
"@dnsjava",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -27,7 +27,6 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_bigquery",
@ -47,6 +46,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -15,7 +15,6 @@ java_library(
"//java/google/registry/export/datastore",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_api_client",
"@com_google_guava",
"@com_google_http_client",
@ -24,6 +23,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -13,7 +13,6 @@ java_library(
"//java/google/registry/export/sheet",
"//java/google/registry/model",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_sheets",
"@com_google_code_findbugs_jsr305",
@ -23,6 +22,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -40,7 +40,6 @@ java_library(
"//javatests/google/registry/model",
"//javatests/google/registry/testing",
"//javatests/google/registry/xml",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_testing",
@ -61,6 +60,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -13,7 +13,6 @@ java_library(
deps = [
"//java/google/registry/groups",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_api_client",
"@com_google_apis_google_api_services_admin_directory",
"@com_google_apis_google_api_services_groupssettings",
@ -27,6 +26,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -13,7 +13,6 @@ java_library(
deps = [
"//java/google/registry/keyring/api",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_flogger",
"@com_google_flogger_system_backend",
"@com_google_guava_testlib",
@ -21,6 +20,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_bouncycastle_bcpg_jdk15on",
"@org_mockito_core",
],
)

View file

@ -20,7 +20,6 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_cloudkms",
@ -32,6 +31,7 @@ java_library(
"@junit",
"@org_bouncycastle_bcpg_jdk15on",
"@org_bouncycastle_bcpkix_jdk15on",
"@org_mockito_core",
],
)

View file

@ -28,7 +28,6 @@ java_library(
"//java/google/registry/xml",
"//javatests/google/registry/testing",
"//javatests/google/registry/xml",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_testing",
@ -41,6 +40,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -17,11 +17,11 @@ java_library(
"//java/google/registry/module/backend",
"//java/google/registry/request",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,11 +17,11 @@ java_library(
"//java/google/registry/module/frontend",
"//java/google/registry/request",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,11 +17,11 @@ java_library(
"//java/google/registry/module/pubapi",
"//java/google/registry/request",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,11 +17,11 @@ java_library(
"//java/google/registry/module/tools",
"//java/google/registry/request",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,6 @@ java_library(
"//java/google/registry/monitoring/whitebox",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk",
@ -29,6 +28,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -21,7 +21,6 @@ java_library(
"//java/google/registry/proxy",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_beust_jcommander",
"@com_google_dagger",
"@com_google_guava",
@ -39,6 +38,7 @@ java_library(
"@joda_time",
"@junit",
"@org_bouncycastle_bcpkix_jdk15on",
"@org_mockito_core",
"@org_yaml_snakeyaml",
],
)

View file

@ -20,7 +20,6 @@ java_library(
"//java/google/registry/ui/server/registrar",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
@ -33,6 +32,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -25,7 +25,6 @@ java_library(
"//javatests/google/registry/testing/mapreduce",
"//javatests/google/registry/testing/sftp",
"//javatests/google/registry/xml",
"//third_party/java/mockito",
"//third_party/jaxb",
"//third_party/jsch/v0_1_53",
"//third_party/objectify:objectify-v4_1",
@ -44,6 +43,7 @@ java_library(
"@org_bouncycastle_bcpg_jdk15on",
"@org_bouncycastle_bcpkix_jdk15on",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,6 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -27,6 +26,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,6 @@ java_library(
"//java/google/registry/storage/drive",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_dataflow",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -31,6 +30,7 @@ java_library(
"@org_apache_beam_runners_google_cloud_dataflow_java",
"@org_apache_beam_sdks_java_core",
"@org_apache_beam_sdks_java_io_google_cloud_platform",
"@org_mockito_core",
],
)

View file

@ -18,7 +18,6 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -30,6 +29,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -18,7 +18,6 @@ java_library(
"//java/google/registry/reporting/spec11/soy:soy_java_wrappers",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_dataflow",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -35,6 +34,7 @@ java_library(
"@org_apache_beam_sdks_java_core",
"@org_apache_beam_sdks_java_io_google_cloud_platform",
"@org_json",
"@org_mockito_core",
],
)

View file

@ -14,7 +14,6 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/request/auth",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_appengine_api_1_0_sdk",
"@com_google_guava",
"@com_google_guava_testlib",
@ -25,6 +24,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,7 +17,6 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/security",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -31,6 +30,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,6 @@ java_library(
"//java/google/registry/request/lock",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -26,6 +25,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,7 +17,6 @@ java_library(
"//java/google/registry/security",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_testing",
"@com_google_guava",
@ -27,6 +26,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -13,13 +13,13 @@ java_library(
deps = [
"//java/google/registry/storage/drive",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_apis_google_api_services_drive",
"@com_google_guava",
"@com_google_http_client",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_mockito_core",
],
)

View file

@ -17,8 +17,9 @@ package google.registry.storage.drive;
import static com.google.common.io.ByteStreams.toByteArray;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -59,15 +60,12 @@ public class DriveConnectionTest {
List<String> allChildren;
private ArgumentMatcher<ByteArrayContent> hasByteArrayContent(final byte[] data) {
return new ArgumentMatcher<ByteArrayContent>() {
@Override
public boolean matches(Object arg) {
return arg -> {
try {
return Arrays.equals(data, toByteArray(((ByteArrayContent) arg).getInputStream()));
return Arrays.equals(data, toByteArray(arg.getInputStream()));
} catch (Exception e) {
return false;
}
}
};
}
@ -97,7 +95,7 @@ public class DriveConnectionTest {
when(childrenList.execute()).thenReturn(childList1, childList2);
when(childrenList.setQ(anyString())).thenReturn(childrenList);
when(childrenList.getPageToken()).thenCallRealMethod();
when(childrenList.setPageToken(anyString())).thenCallRealMethod();
when(childrenList.setPageToken(any())).thenCallRealMethod();
when(children.list("driveFolderId")).thenReturn(childrenList);
}
@ -113,7 +111,8 @@ public class DriveConnectionTest {
@Test
public void testCreateFileInFolder() throws Exception {
when(files.insert(
eq(new File()
eq(
new File()
.setTitle("title")
.setMimeType("image/gif")
.setParents(ImmutableList.of(new ParentReference().setId("parent")))),
@ -164,7 +163,8 @@ public class DriveConnectionTest {
@Test
public void testCreateOrUpdateFile_succeedsForNewFile() throws Exception {
when(files.insert(
eq(new File()
eq(
new File()
.setTitle("title")
.setMimeType("video/webm")
.setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))),
@ -183,9 +183,7 @@ public class DriveConnectionTest {
@Test
public void testCreateOrUpdateFile_succeedsForUpdatingFile() throws Exception {
when(files.update(
eq("id"),
eq(new File().setTitle("title")),
argThat(hasByteArrayContent(DATA))))
eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA))))
.thenReturn(update);
ChildList childList = new ChildList()
.setItems(ImmutableList.of(new ChildReference().setId("id")))
@ -224,9 +222,7 @@ public class DriveConnectionTest {
@Test
public void testUpdateFile_succeeds() throws Exception {
when(files.update(
eq("id"),
eq(new File().setTitle("title")),
argThat(hasByteArrayContent(DATA))))
eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA))))
.thenReturn(update);
assertThat(driveConnection.updateFile("id", "title", MediaType.WEBM_VIDEO, DATA))
.isEqualTo("id");

View file

@ -35,7 +35,6 @@ java_library(
"//java/google/registry/tmch",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_appengine",
"@com_google_appengine_api_1_0_sdk",
@ -60,6 +59,7 @@ java_library(
"@org_bouncycastle_bcpkix_jdk15on",
"@org_joda_money",
"@org_json",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,6 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_api_stubs",
"@com_google_appengine_testing",
@ -30,6 +29,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@javax_servlet_api",
"@junit",
"@org_mockito_core",
],
)

View file

@ -21,7 +21,6 @@ java_library(
"//java/google/registry/tmch",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_flogger",
@ -32,6 +31,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -38,7 +38,6 @@ java_library(
"//javatests/google/registry/tmch",
"//javatests/google/registry/tools/server",
"//javatests/google/registry/xml",
"//third_party/java/mockito",
"//third_party/jaxb",
"//third_party/objectify:objectify-v4_1",
"@com_beust_jcommander",
@ -61,6 +60,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -21,7 +21,6 @@ java_library(
"//javatests/google/registry/model",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
@ -34,6 +33,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -13,13 +13,13 @@ java_library(
deps = [
"//java/google/registry/ui/forms",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_guava",
"@com_google_guava_testlib",
"@com_google_re2j",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_mockito_core",
],
)

View file

@ -15,13 +15,13 @@ java_library(
"//java/google/registry/ui/server",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_appengine_api_1_0_sdk",
"@com_google_guava",
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_hamcrest_library",
"@org_mockito_core",
],
)

View file

@ -25,7 +25,6 @@ java_library(
"//javatests/google/registry/model",
"//javatests/google/registry/security",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_flogger",
@ -40,6 +39,7 @@ java_library(
"@joda_time",
"@junit",
"@org_joda_money",
"@org_mockito_core",
],
)

View file

@ -13,7 +13,6 @@ java_library(
deps = [
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
"@com_google_flogger",
@ -24,6 +23,7 @@ java_library(
"@com_google_truth_extensions_truth_java8_extension",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)

View file

@ -16,7 +16,7 @@ package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.LogsSubject.assertAboutLogs;
import static org.mockito.Matchers.argThat;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -35,7 +35,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.ArgumentMatcher;
/** Unit tests for {@link RequestStatusCheckerImpl}. */
@RunWith(JUnit4.class)
@ -53,16 +52,12 @@ public final class RequestStatusCheckerImplTest {
*/
private static LogQuery expectedLogQuery(final String requestLogId) {
return argThat(
new ArgumentMatcher<LogQuery>() {
@Override
public boolean matches(Object object) {
object -> {
assertThat(object).isInstanceOf(LogQuery.class);
LogQuery logQuery = (LogQuery) object;
assertThat(logQuery.getRequestIds()).containsExactly(requestLogId);
assertThat(logQuery.getIncludeAppLogs()).isFalse();
assertThat(logQuery.getIncludeIncomplete()).isTrue();
assertThat(object.getRequestIds()).containsExactly(requestLogId);
assertThat(object.getIncludeAppLogs()).isFalse();
assertThat(object.getIncludeIncomplete()).isTrue();
return true;
}
});
}

View file

@ -18,7 +18,6 @@ java_library(
"//java/google/registry/util",
"//java/google/registry/whois",
"//javatests/google/registry/testing",
"//third_party/java/mockito",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_testing",
@ -33,6 +32,7 @@ java_library(
"@javax_servlet_api",
"@joda_time",
"@junit",
"@org_mockito_core",
],
)