zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-06 01:35:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Upgradle JUnit to 4.13 (#442)

Browse source 
* Upgradle JUnit to 4.13

Removed third_party/junit folder and all usage of the
JunitBackPort class. As a result, third_party is no
longer a Gradle subproject.

Minor code changes were needed to work around an
error-prone pattern: multiple statement in assertThrows'
runnable lambda.

Also third_party/activation and third_party/jsch. These
dependencies are loaded from remote maven repo. The local
copies are not in use.
This commit is contained in:
Weimin Yu 2020-01-14 10:54:09 -05:00 • committed by GitHub
parent 8a28e4dcc3
commit 74c614d002
336 changed files with 322 additions and 1646 deletions
Download patch file Download diff file Expand all files Collapse all files

1
networking/build.gradle
View file

@ -36,7 +36,6 @@ dependencies {
testCompile deps['junit:junit']
testCompile deps['org.bouncycastle:bcpkix-jdk15on']
testCompile deps['org.bouncycastle:bcprov-jdk15on']
testCompile project(':third_party')
annotationProcessor deps['com.google.dagger:dagger-compiler']
testAnnotationProcessor deps['com.google.dagger:dagger-compiler']

2
networking/gradle/dependency-locks/testCompile.lockfile
View file

@ -41,7 +41,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
junit:junit:4.12
junit:junit:4.13
org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpkix-jdk15on:1.61

2
networking/gradle/dependency-locks/testCompileClasspath.lockfile
View file

@ -41,7 +41,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
junit:junit:4.12
junit:junit:4.13
org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpkix-jdk15on:1.61

2
networking/gradle/dependency-locks/testRuntime.lockfile
View file

@ -43,7 +43,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
junit:junit:4.12
junit:junit:4.13
org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpkix-jdk15on:1.61

2
networking/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file

@ -43,7 +43,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
junit:junit:4.12
junit:junit:4.13
org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpkix-jdk15on:1.61

2
networking/src/test/java/google/registry/networking/handler/NettyRule.java
View file

@ -16,9 +16,9 @@ package google.registry.networking.handler;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertThrows;
import com.google.common.base.Throwables;
import com.google.common.truth.ThrowableSubject;

2
networking/src/test/java/google/registry/networking/handler/SslInitializerTestUtils.java
View file

@ -15,7 +15,7 @@
package google.registry.networking.handler;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import com.google.common.base.Throwables;
import io.netty.channel.Channel;

2
networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java
View file

@ -17,8 +17,8 @@ package google.registry.networking.module;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.networking.handler.SslInitializerTestUtils.getKeyPair;
import static google.registry.networking.handler.SslInitializerTestUtils.signKeyPair;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import dagger.BindsInstance;