grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: update to truth 0.45

This commit is contained in:
Carl Mastrangelo 2019-06-04 21:12:21 -07:00 committed by GitHub
parent 23170c298e
commit 409afe5867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-interop-testing/app/build.gradle
View File

@ -66,7 +66,7 @@ dependencies {
implementation ('com.google.auth:google-auth-library-oauth2-http:0.9.0') { implementation ('com.google.auth:google-auth-library-oauth2-http:0.9.0') {
exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.apache.httpcomponents', module: 'httpclient'
} }
implementation 'com.google.truth:truth:0.44' implementation 'com.google.truth:truth:0.45'
implementation 'javax.annotation:javax.annotation-api:1.2' implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'junit:junit:4.12' implementation 'junit:junit:4.12'

2
android/build.gradle
View File

@ -51,7 +51,7 @@ dependencies {
testImplementation 'io.grpc:grpc-okhttp:1.22.0-SNAPSHOT' // CURRENT_GRPC_VERSION testImplementation 'io.grpc:grpc-okhttp:1.22.0-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.7.1' testImplementation 'org.robolectric:robolectric:3.7.1'
testImplementation 'com.google.truth:truth:0.44' testImplementation 'com.google.truth:truth:0.45'
} }
signing { signing {

2
build.gradle
View File

@ -229,7 +229,7 @@ subprojects {
// Test dependencies. // Test dependencies.
junit: 'junit:junit:4.12', junit: 'junit:junit:4.12',
mockito: 'org.mockito:mockito-core:2.25.1', mockito: 'org.mockito:mockito-core:2.25.1',
truth: 'com.google.truth:truth:0.44', truth: 'com.google.truth:truth:0.45',
guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}", guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}",
// Benchmark dependencies // Benchmark dependencies

10
context/src/test/java/io/grpc/testing/DeadlineSubject.java
View File

@ -17,8 +17,7 @@
package io.grpc.testing; package io.grpc.testing;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.lenientFormat; import static com.google.common.truth.Fact.fact;
import static com.google.common.truth.Fact.simpleFact;
import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS;
import com.google.common.truth.ComparableSubject; import com.google.common.truth.ComparableSubject;
@ -66,10 +65,9 @@ public final class DeadlineSubject extends ComparableSubject<DeadlineSubject, De
BigInteger deltaNanos = BigInteger.valueOf(timeUnit.toNanos(delta)); BigInteger deltaNanos = BigInteger.valueOf(timeUnit.toNanos(delta));
if (actualTimeRemaining.subtract(expectedTimeRemaining).abs().compareTo(deltaNanos) > 0) { if (actualTimeRemaining.subtract(expectedTimeRemaining).abs().compareTo(deltaNanos) > 0) {
failWithoutActual( failWithoutActual(
simpleFact( fact("expected", expected),
lenientFormat( fact("but was", actual),
"%s and <%s> should have been within <%sns> of each other", fact("outside tolerance in ns", deltaNanos));
actualAsString(), expected, deltaNanos)));
} }
} }
}; };

2
examples/android/clientcache/app/build.gradle
View File

@ -55,6 +55,6 @@ dependencies {
implementation 'javax.annotation:javax.annotation-api:1.2' implementation 'javax.annotation:javax.annotation-api:1.2'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.44' testImplementation 'com.google.truth:truth:0.45'
testImplementation 'io.grpc:grpc-testing:1.22.0-SNAPSHOT' // CURRENT_GRPC_VERSION testImplementation 'io.grpc:grpc-testing:1.22.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

4
repositories.bzl
View File

@ -253,9 +253,9 @@ def com_google_protobuf_javalite():
def com_google_truth_truth(): def com_google_truth_truth():
jvm_maven_import_external( jvm_maven_import_external(
name = "com_google_truth_truth", name = "com_google_truth_truth",
artifact = "com.google.truth:truth:0.44", artifact = "com.google.truth:truth:0.45",
server_urls = ["http://central.maven.org/maven2"], server_urls = ["http://central.maven.org/maven2"],
artifact_sha256 = "a9e6796786c9c77a5fe19b08e72fe0a620d53166df423d8861af9ebef4dc4247", artifact_sha256 = "0f7dced2a16e55a77e44fc3ff9c5be98d4bf4bb30abc18d78ffd735df950a69f",
licenses = ["notice"], # Apache 2.0 licenses = ["notice"], # Apache 2.0
) )