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

context: Avoid deprecated Truth API 

This helps an internal cleanup removing the old failWithRawMessage API.
This commit is contained in:
Eric Anderson 2018-07-18 15:26:38 -07:00
parent 4e276a52f3
commit 6d7c7dc583
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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:1.9.5', mockito: 'org.mockito:mockito-core:1.9.5',
truth: 'com.google.truth:truth:0.36', truth: 'com.google.truth:truth:0.42',
guava_testlib: 'com.google.guava:guava-testlib:20.0', guava_testlib: 'com.google.guava:guava-testlib:20.0',
// Benchmark dependencies // Benchmark dependencies

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

@ -17,6 +17,8 @@
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.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;
@ -60,11 +62,11 @@ public final class DeadlineSubject extends ComparableSubject<DeadlineSubject, De
BigInteger expectedTimeRemaining = BigInteger.valueOf(expected.timeRemaining(NANOSECONDS)); BigInteger expectedTimeRemaining = BigInteger.valueOf(expected.timeRemaining(NANOSECONDS));
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) {
failWithRawMessage( failWithoutActual(
"%s and <%s> should have been within <%sns> of each other", simpleFact(
actualAsString(), lenientFormat(
expected, "%s and <%s> should have been within <%sns> of each other",
deltaNanos); actualAsString(), expected, deltaNanos)));
} }
} }
}; };