Skip to content

Commit e64f659

Browse files
grpc-api/stub: Implementation for InternalTimeUtil under grpc-api module
1 parent bd5a80a commit e64f659

File tree

4 files changed

+23
-34
lines changed

4 files changed

+23
-34
lines changed

api/src/main/java/io/grpc/InternalTimeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@Internal
2222
public final class InternalTimeUtils {
23-
static long convert(Duration duration) {
23+
public static long convert(Duration duration) {
2424
try {
2525
return duration.toNanos();
2626
} catch (ArithmeticException tooBig) {

stub/src/main/java/io/grpc/stub/AbstractStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.grpc.stub;
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
20-
import static io.grpc.stub.InternalTimeUtils.convert;
20+
import static io.grpc.InternalTimeUtils.convert;
2121

2222
import io.grpc.CallCredentials;
2323
import io.grpc.CallOptions;

stub/src/main/java/io/grpc/stub/InternalTimeUtils.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

stub/src/test/java/io/grpc/stub/AbstractStubTest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@
1616

1717
package io.grpc.stub;
1818

19+
import static com.google.common.truth.Truth.assertAbout;
1920
import static com.google.common.truth.Truth.assertThat;
21+
import static io.grpc.testing.DeadlineSubject.deadline;
22+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
23+
import static java.util.concurrent.TimeUnit.MINUTES;
2024

2125
import io.grpc.CallOptions;
2226
import io.grpc.Channel;
27+
import io.grpc.Deadline;
2328
import io.grpc.stub.AbstractStub.StubFactory;
2429
import io.grpc.stub.AbstractStubTest.NoopStub;
30+
import java.time.Duration;
2531
import org.junit.Test;
2632
import org.junit.runner.RunWith;
2733
import org.junit.runners.JUnit4;
@@ -47,8 +53,22 @@ public NoopStub newStub(Channel channel, CallOptions callOptions) {
4753
.isNull();
4854
}
4955

50-
class NoopStub extends AbstractStub<NoopStub> {
56+
@Test
57+
public void testDuration() {
58+
NoopStub stub = NoopStub.newStub(new StubFactory<NoopStub>() {
59+
@Override
60+
public NoopStub newStub(Channel channel, CallOptions callOptions) {
61+
return create(channel, callOptions);
62+
}
63+
}, channel, CallOptions.DEFAULT);
64+
NoopStub stubInstance = stub.withDeadlineAfter(Duration.ofMinutes(1L));
65+
Deadline actual = stubInstance.getCallOptions().getDeadline();
66+
Deadline expected = Deadline.after(1, MINUTES);
5167

68+
assertAbout(deadline()).that(actual).isWithin(10, MILLISECONDS).of(expected);
69+
}
70+
71+
class NoopStub extends AbstractStub<NoopStub> {
5272
NoopStub(Channel channel, CallOptions options) {
5373
super(channel, options);
5474
}

0 commit comments

Comments
 (0)