diff --git a/gradle/buildSrc/build.gradle b/gradle/buildSrc/build.gradle index bf8c78c3f..ab917aecb 100644 --- a/gradle/buildSrc/build.gradle +++ b/gradle/buildSrc/build.gradle @@ -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 { diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle index 58d392a1b..bdf2e17cd 100644 --- a/gradle/core/build.gradle +++ b/gradle/core/build.gradle @@ -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 diff --git a/gradle/core/gradle/dependency-locks/compile.lockfile b/gradle/core/gradle/dependency-locks/compile.lockfile index 13be059e2..3244b214f 100644 --- a/gradle/core/gradle/dependency-locks/compile.lockfile +++ b/gradle/core/gradle/dependency-locks/compile.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/compileClasspath.lockfile b/gradle/core/gradle/dependency-locks/compileClasspath.lockfile index cd775254f..f0def7a0c 100644 --- a/gradle/core/gradle/dependency-locks/compileClasspath.lockfile +++ b/gradle/core/gradle/dependency-locks/compileClasspath.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/css.lockfile b/gradle/core/gradle/dependency-locks/css.lockfile index 845be8824..99c7ff2b3 100644 --- a/gradle/core/gradle/dependency-locks/css.lockfile +++ b/gradle/core/gradle/dependency-locks/css.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/default.lockfile b/gradle/core/gradle/dependency-locks/default.lockfile index 2a8832b7c..a509691c3 100644 --- a/gradle/core/gradle/dependency-locks/default.lockfile +++ b/gradle/core/gradle/dependency-locks/default.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/runtime.lockfile b/gradle/core/gradle/dependency-locks/runtime.lockfile index 2a8832b7c..a509691c3 100644 --- a/gradle/core/gradle/dependency-locks/runtime.lockfile +++ b/gradle/core/gradle/dependency-locks/runtime.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile index 2a8832b7c..a509691c3 100644 --- a/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/testCompile.lockfile b/gradle/core/gradle/dependency-locks/testCompile.lockfile index 80546e300..afa9fb952 100644 --- a/gradle/core/gradle/dependency-locks/testCompile.lockfile +++ b/gradle/core/gradle/dependency-locks/testCompile.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile index 3489be196..6d078b5ba 100644 --- a/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/testRuntime.lockfile b/gradle/core/gradle/dependency-locks/testRuntime.lockfile index 9b37bceb4..604a04855 100644 --- a/gradle/core/gradle/dependency-locks/testRuntime.lockfile +++ b/gradle/core/gradle/dependency-locks/testRuntime.lockfile @@ -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 diff --git a/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 9b37bceb4..604a04855 100644 --- a/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -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 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index b607b0808..a5e1d6e30 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -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', diff --git a/gradle/proxy/build.gradle b/gradle/proxy/build.gradle index 701258365..c10d8888b 100644 --- a/gradle/proxy/build.gradle +++ b/gradle/proxy/build.gradle @@ -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') diff --git a/gradle/proxy/gradle/dependency-locks/testCompile.lockfile b/gradle/proxy/gradle/dependency-locks/testCompile.lockfile index a196f3a03..fa60383e0 100644 --- a/gradle/proxy/gradle/dependency-locks/testCompile.lockfile +++ b/gradle/proxy/gradle/dependency-locks/testCompile.lockfile @@ -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 diff --git a/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile index bcfe3c520..83f48bdde 100644 --- a/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile @@ -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 diff --git a/gradle/proxy/gradle/dependency-locks/testRuntime.lockfile b/gradle/proxy/gradle/dependency-locks/testRuntime.lockfile index 6b5f22064..913b4bd79 100644 --- a/gradle/proxy/gradle/dependency-locks/testRuntime.lockfile +++ b/gradle/proxy/gradle/dependency-locks/testRuntime.lockfile @@ -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 diff --git a/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile index 6b5f22064..913b4bd79 100644 --- a/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -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 diff --git a/gradle/util/build.gradle b/gradle/util/build.gradle index b6a650d57..289b882a2 100644 --- a/gradle/util/build.gradle +++ b/gradle/util/build.gradle @@ -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') diff --git a/gradle/util/gradle/dependency-locks/testCompile.lockfile b/gradle/util/gradle/dependency-locks/testCompile.lockfile index 9b37bceb4..604a04855 100644 --- a/gradle/util/gradle/dependency-locks/testCompile.lockfile +++ b/gradle/util/gradle/dependency-locks/testCompile.lockfile @@ -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 diff --git a/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile index a58b55099..d7e168f2e 100644 --- a/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile @@ -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 diff --git a/gradle/util/gradle/dependency-locks/testRuntime.lockfile b/gradle/util/gradle/dependency-locks/testRuntime.lockfile index 9b37bceb4..604a04855 100644 --- a/gradle/util/gradle/dependency-locks/testRuntime.lockfile +++ b/gradle/util/gradle/dependency-locks/testRuntime.lockfile @@ -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 diff --git a/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile index 9b37bceb4..604a04855 100644 --- a/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -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 diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 8e6c5767d..7d9160774 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -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"], ) diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD index 04a5e4511..7b6521a3c 100644 --- a/javatests/google/registry/backup/BUILD +++ b/javatests/google/registry/backup/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD index ccb7b619d..1dcf46ae4 100644 --- a/javatests/google/registry/batch/BUILD +++ b/javatests/google/registry/batch/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/beam/BUILD b/javatests/google/registry/beam/BUILD index d0d0c04b0..0c1ac85af 100644 --- a/javatests/google/registry/beam/BUILD +++ b/javatests/google/registry/beam/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/beam/invoicing/BUILD b/javatests/google/registry/beam/invoicing/BUILD index ed18a112e..0cf5bcaed 100644 --- a/javatests/google/registry/beam/invoicing/BUILD +++ b/javatests/google/registry/beam/invoicing/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/beam/spec11/BUILD b/javatests/google/registry/beam/spec11/BUILD index 1362fc65d..280bc9b10 100644 --- a/javatests/google/registry/beam/spec11/BUILD +++ b/javatests/google/registry/beam/spec11/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/bigquery/BUILD b/javatests/google/registry/bigquery/BUILD index b95950f88..0b22437e3 100644 --- a/javatests/google/registry/bigquery/BUILD +++ b/javatests/google/registry/bigquery/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD index 40eab603a..43a552382 100644 --- a/javatests/google/registry/dns/BUILD +++ b/javatests/google/registry/dns/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD index ded9e6a4f..a30b89aff 100644 --- a/javatests/google/registry/dns/writer/clouddns/BUILD +++ b/javatests/google/registry/dns/writer/clouddns/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD index 4c94d3dcc..00034aebb 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/BUILD +++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/export/BUILD b/javatests/google/registry/export/BUILD index 277c0a5d7..8e5ec477d 100644 --- a/javatests/google/registry/export/BUILD +++ b/javatests/google/registry/export/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/export/datastore/BUILD b/javatests/google/registry/export/datastore/BUILD index 217e221e6..79588bd82 100644 --- a/javatests/google/registry/export/datastore/BUILD +++ b/javatests/google/registry/export/datastore/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD index a6fbe5e05..cccb79145 100644 --- a/javatests/google/registry/export/sheet/BUILD +++ b/javatests/google/registry/export/sheet/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/flows/BUILD b/javatests/google/registry/flows/BUILD index 96f7df654..04cc976fa 100644 --- a/javatests/google/registry/flows/BUILD +++ b/javatests/google/registry/flows/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/groups/BUILD b/javatests/google/registry/groups/BUILD index e793891f3..5be4b88da 100644 --- a/javatests/google/registry/groups/BUILD +++ b/javatests/google/registry/groups/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/keyring/api/BUILD b/javatests/google/registry/keyring/api/BUILD index bd607a116..1cfb9e8bf 100644 --- a/javatests/google/registry/keyring/api/BUILD +++ b/javatests/google/registry/keyring/api/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/keyring/kms/BUILD b/javatests/google/registry/keyring/kms/BUILD index bbf6a21c7..efed0e281 100644 --- a/javatests/google/registry/keyring/kms/BUILD +++ b/javatests/google/registry/keyring/kms/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index f41beb778..63f7dbe6b 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD index d292db036..9fd2f9fc1 100644 --- a/javatests/google/registry/module/backend/BUILD +++ b/javatests/google/registry/module/backend/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index 94ce19833..ba86b90cc 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/javatests/google/registry/module/frontend/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/module/pubapi/BUILD b/javatests/google/registry/module/pubapi/BUILD index c086f26df..1920b83b0 100644 --- a/javatests/google/registry/module/pubapi/BUILD +++ b/javatests/google/registry/module/pubapi/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index d11811483..36dc3c496 100644 --- a/javatests/google/registry/module/tools/BUILD +++ b/javatests/google/registry/module/tools/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index 1d4a41320..26a5e25a0 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/proxy/BUILD b/javatests/google/registry/proxy/BUILD index 14aafe7c0..b4c2269f6 100644 --- a/javatests/google/registry/proxy/BUILD +++ b/javatests/google/registry/proxy/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index 5e3201d9b..678e9c5f8 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 808c67c72..805ef1ef6 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/reporting/BUILD b/javatests/google/registry/reporting/BUILD index e50717c10..87339ff68 100644 --- a/javatests/google/registry/reporting/BUILD +++ b/javatests/google/registry/reporting/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/reporting/billing/BUILD b/javatests/google/registry/reporting/billing/BUILD index f15cf5b70..5aa80cc49 100644 --- a/javatests/google/registry/reporting/billing/BUILD +++ b/javatests/google/registry/reporting/billing/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/reporting/icann/BUILD b/javatests/google/registry/reporting/icann/BUILD index 26473bd64..53bb7f759 100644 --- a/javatests/google/registry/reporting/icann/BUILD +++ b/javatests/google/registry/reporting/icann/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/reporting/spec11/BUILD b/javatests/google/registry/reporting/spec11/BUILD index 91c2006f4..56c857827 100644 --- a/javatests/google/registry/reporting/spec11/BUILD +++ b/javatests/google/registry/reporting/spec11/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/request/BUILD b/javatests/google/registry/request/BUILD index 77348b4b8..af5c7b0b4 100644 --- a/javatests/google/registry/request/BUILD +++ b/javatests/google/registry/request/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/request/auth/BUILD b/javatests/google/registry/request/auth/BUILD index ddc9da96d..e6cf39152 100644 --- a/javatests/google/registry/request/auth/BUILD +++ b/javatests/google/registry/request/auth/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/request/lock/BUILD b/javatests/google/registry/request/lock/BUILD index cade7d6b6..aef37dd86 100644 --- a/javatests/google/registry/request/lock/BUILD +++ b/javatests/google/registry/request/lock/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index 2babe4992..2caaf39c5 100644 --- a/javatests/google/registry/security/BUILD +++ b/javatests/google/registry/security/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/storage/drive/BUILD b/javatests/google/registry/storage/drive/BUILD index 58fc136c3..c1f2ca4ee 100644 --- a/javatests/google/registry/storage/drive/BUILD +++ b/javatests/google/registry/storage/drive/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/storage/drive/DriveConnectionTest.java b/javatests/google/registry/storage/drive/DriveConnectionTest.java index 01bc0a4dc..be2e1c750 100644 --- a/javatests/google/registry/storage/drive/DriveConnectionTest.java +++ b/javatests/google/registry/storage/drive/DriveConnectionTest.java @@ -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,14 +60,11 @@ public class DriveConnectionTest { List allChildren; private ArgumentMatcher hasByteArrayContent(final byte[] data) { - return new ArgumentMatcher() { - @Override - public boolean matches(Object arg) { - try { - return Arrays.equals(data, toByteArray(((ByteArrayContent) arg).getInputStream())); - } catch (Exception e) { - return false; - } + return arg -> { + try { + return Arrays.equals(data, toByteArray(arg.getInputStream())); + } catch (Exception e) { + return false; } }; } @@ -97,28 +95,29 @@ 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); } @Test public void testCreateFileAtRoot() throws Exception { when(files.insert( - eq(new File().setTitle("title").setMimeType("image/gif")), - argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); + eq(new File().setTitle("title").setMimeType("image/gif")), + argThat(hasByteArrayContent(DATA)))) + .thenReturn(insert); assertThat(driveConnection.createFile("title", MediaType.GIF, null, DATA)).isEqualTo("id"); } @Test public void testCreateFileInFolder() throws Exception { when(files.insert( - eq(new File() - .setTitle("title") - .setMimeType("image/gif") - .setParents(ImmutableList.of(new ParentReference().setId("parent")))), - argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); + eq( + new File() + .setTitle("title") + .setMimeType("image/gif") + .setParents(ImmutableList.of(new ParentReference().setId("parent")))), + argThat(hasByteArrayContent(DATA)))) + .thenReturn(insert); assertThat(driveConnection.createFile("title", MediaType.GIF, "parent", DATA)).isEqualTo("id"); } @@ -164,12 +163,13 @@ public class DriveConnectionTest { @Test public void testCreateOrUpdateFile_succeedsForNewFile() throws Exception { when(files.insert( - eq(new File() - .setTitle("title") - .setMimeType("video/webm") - .setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))), - argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); + eq( + new File() + .setTitle("title") + .setMimeType("video/webm") + .setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))), + argThat(hasByteArrayContent(DATA)))) + .thenReturn(insert); ChildList emptyChildList = new ChildList().setItems(ImmutableList.of()).setNextPageToken(null); when(childrenList.execute()).thenReturn(emptyChildList); assertThat(driveConnection.createOrUpdateFile( @@ -183,10 +183,8 @@ public class DriveConnectionTest { @Test public void testCreateOrUpdateFile_succeedsForUpdatingFile() throws Exception { when(files.update( - eq("id"), - eq(new File().setTitle("title")), - argThat(hasByteArrayContent(DATA)))) - .thenReturn(update); + eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA)))) + .thenReturn(update); ChildList childList = new ChildList() .setItems(ImmutableList.of(new ChildReference().setId("id"))) .setNextPageToken(null); @@ -224,10 +222,8 @@ public class DriveConnectionTest { @Test public void testUpdateFile_succeeds() throws Exception { when(files.update( - eq("id"), - eq(new File().setTitle("title")), - argThat(hasByteArrayContent(DATA)))) - .thenReturn(update); + eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA)))) + .thenReturn(update); assertThat(driveConnection.updateFile("id", "title", MediaType.WEBM_VIDEO, DATA)) .isEqualTo("id"); } diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index 2c991f51b..e5f10c960 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index b055093f6..67ad37f36 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/javatests/google/registry/testing/mapreduce/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index f6c94790e..f4272c2ff 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/javatests/google/registry/tmch/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index bc2289437..500c2f7b9 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index d152d9129..6bc998260 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/javatests/google/registry/tools/server/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD index 64f259aaf..1572284de 100644 --- a/javatests/google/registry/ui/forms/BUILD +++ b/javatests/google/registry/ui/forms/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/ui/server/BUILD b/javatests/google/registry/ui/server/BUILD index 5518bd2bc..5f6d59cea 100644 --- a/javatests/google/registry/ui/server/BUILD +++ b/javatests/google/registry/ui/server/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index 495ad3dfd..abe4269cd 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index a355fc541..ac4cdc3a4 100644 --- a/javatests/google/registry/util/BUILD +++ b/javatests/google/registry/util/BUILD @@ -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", ], ) diff --git a/javatests/google/registry/util/RequestStatusCheckerImplTest.java b/javatests/google/registry/util/RequestStatusCheckerImplTest.java index cc81fe77b..8a44db344 100644 --- a/javatests/google/registry/util/RequestStatusCheckerImplTest.java +++ b/javatests/google/registry/util/RequestStatusCheckerImplTest.java @@ -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() { - @Override - public boolean matches(Object object) { - assertThat(object).isInstanceOf(LogQuery.class); - LogQuery logQuery = (LogQuery) object; - assertThat(logQuery.getRequestIds()).containsExactly(requestLogId); - assertThat(logQuery.getIncludeAppLogs()).isFalse(); - assertThat(logQuery.getIncludeIncomplete()).isTrue(); - return true; - } + object -> { + assertThat(object).isInstanceOf(LogQuery.class); + assertThat(object.getRequestIds()).containsExactly(requestLogId); + assertThat(object.getIncludeAppLogs()).isFalse(); + assertThat(object.getIncludeIncomplete()).isTrue(); + return true; }); } diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index 5db398d64..6bc74b5b2 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -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", ], )