aboutsummaryrefslogtreecommitdiff
path: root/netty
diff options
context:
space:
mode:
authorZHANG Dapeng <zdapeng@google.com>2018-05-21 12:44:06 -0700
committerGitHub <noreply@github.com>2018-05-21 12:44:06 -0700
commitf5f560ad365735a0c9bf8b86abeed16cf7dfdde7 (patch)
treeb0a34ef4d5036958b505cc1a4785ba883a91dfda /netty
parent30478d88c722a5a25e74f80e43578cb265d0ccfb (diff)
downloadgrpc-grpc-java-f5f560ad365735a0c9bf8b86abeed16cf7dfdde7.tar.gz
all: TimeProvider to use nanos rather than millis
This is the same practice as #2833
Diffstat (limited to 'netty')
-rw-r--r--netty/src/test/java/io/grpc/netty/NettyTransportTest.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/netty/src/test/java/io/grpc/netty/NettyTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyTransportTest.java
index bcb0aa7f7..3fb2233f9 100644
--- a/netty/src/test/java/io/grpc/netty/NettyTransportTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyTransportTest.java
@@ -21,7 +21,6 @@ import io.grpc.internal.ClientTransportFactory;
import io.grpc.internal.FakeClock;
import io.grpc.internal.InternalServer;
import io.grpc.internal.ManagedClientTransport;
-import io.grpc.internal.TransportTracer;
import io.grpc.internal.testing.AbstractTransportTest;
import java.net.InetSocketAddress;
import java.util.List;
@@ -36,13 +35,6 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class NettyTransportTest extends AbstractTransportTest {
private final FakeClock fakeClock = new FakeClock();
- private final TransportTracer.Factory fakeClockTransportTracer = new TransportTracer.Factory(
- new TransportTracer.TimeProvider() {
- @Override
- public long currentTimeMillis() {
- return fakeClock.currentTimeMillis();
- }
- });
// Avoid LocalChannel for testing because LocalChannel can fail with
// io.netty.channel.ChannelException instead of java.net.ConnectException which breaks
// serverNotListening test.
@@ -95,8 +87,8 @@ public class NettyTransportTest extends AbstractTransportTest {
}
@Override
- protected long currentTimeMillis() {
- return fakeClock.currentTimeMillis();
+ protected long fakeCurrentTimeNanos() {
+ return fakeClock.getTicker().read();
}
@Override