Skip to content

Commit 7481c2b

Browse files
sergiitksergiitk
committed
core: use concrete managed channel builder in tests
1 parent 9d8f77c commit 7481c2b

3 files changed

Lines changed: 58 additions & 78 deletions

File tree

‎core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import io.grpc.Status;
6363
import io.grpc.StringMarshaller;
6464
import io.grpc.internal.FakeClock.ScheduledTask;
65+
import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder;
6566
import io.grpc.internal.TestUtils.MockClientTransportInfo;
6667
import java.net.SocketAddress;
6768
import java.net.URI;
@@ -159,21 +160,15 @@ public void setUp() {
159160
when(mockTransportFactory.getScheduledExecutorService())
160161
.thenReturn(timer.getScheduledExecutorService());
161162

162-
class Builder extends AbstractManagedChannelImplBuilder<Builder> {
163-
Builder(String target) {
164-
super(target);
165-
}
166-
167-
@Override protected ClientTransportFactory buildTransportFactory() {
168-
throw new UnsupportedOperationException();
169-
}
170-
171-
@Override public Builder usePlaintext() {
172-
throw new UnsupportedOperationException();
173-
}
174-
}
163+
ManagedChannelImplBuilder builder = new ManagedChannelImplBuilder("fake://target",
164+
new ClientTransportFactoryBuilder() {
165+
@Override public ClientTransportFactory buildClientTransportFactory() {
166+
throw new UnsupportedOperationException();
167+
}
168+
},
169+
null);
175170

176-
Builder builder = new Builder("fake://target")
171+
builder
177172
.nameResolverFactory(mockNameResolverFactory)
178173
.defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
179174
.idleTimeout(IDLE_TIMEOUT_SECONDS, TimeUnit.SECONDS)

‎core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java‎

Lines changed: 29 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
import io.grpc.internal.ClientTransportFactory.ClientTransportOptions;
108108
import io.grpc.internal.InternalSubchannel.TransportLogger;
109109
import io.grpc.internal.ManagedChannelImpl.ScParser;
110+
import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider;
111+
import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder;
110112
import io.grpc.internal.ServiceConfigUtil.PolicySelection;
111113
import io.grpc.internal.TestUtils.MockClientTransportInfo;
112114
import io.grpc.stub.ClientCalls;
@@ -269,7 +271,17 @@ public String getPolicyName() {
269271
private CallCredentials creds;
270272
@Mock
271273
private Executor offloadExecutor;
272-
private ChannelBuilder channelBuilder;
274+
private ManagedChannelImplBuilder channelBuilder = new ManagedChannelImplBuilder(TARGET,
275+
new ClientTransportFactoryBuilder() {
276+
@Override public ClientTransportFactory buildClientTransportFactory() {
277+
throw new UnsupportedOperationException();
278+
}
279+
},
280+
new ChannelBuilderDefaultPortProvider() {
281+
@Override public int getDefaultPort() {
282+
return DEFAULT_PORT;
283+
}
284+
});
273285
private boolean requestConnection = true;
274286
private BlockingQueue<MockClientTransportInfo> transports;
275287
private boolean panicExpected;
@@ -325,14 +337,12 @@ public void setUp() throws Exception {
325337
when(balancerRpcExecutorPool.getObject())
326338
.thenReturn(balancerRpcExecutor.getScheduledExecutorService());
327339

328-
channelBuilder =
329-
new ChannelBuilder()
330-
.nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
331-
.defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
332-
.userAgent(USER_AGENT)
333-
.idleTimeout(
334-
AbstractManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
335-
.offloadExecutor(offloadExecutor);
340+
channelBuilder
341+
.nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
342+
.defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
343+
.userAgent(USER_AGENT)
344+
.idleTimeout(ManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
345+
.offloadExecutor(offloadExecutor);
336346
channelBuilder.executorPool = executorPool;
337347
channelBuilder.binlog = null;
338348
channelBuilder.channelz = channelz;
@@ -3466,21 +3476,17 @@ public String getDefaultScheme() {
34663476
}
34673477

34683478
FakeNameResolverFactory2 factory = new FakeNameResolverFactory2();
3469-
final class CustomBuilder extends AbstractManagedChannelImplBuilder<CustomBuilder> {
3470-
3471-
CustomBuilder() {
3472-
super(TARGET);
3473-
this.executorPool = ManagedChannelImplTest.this.executorPool;
3474-
this.channelz = ManagedChannelImplTest.this.channelz;
3475-
}
3476-
3477-
@Override
3478-
protected ClientTransportFactory buildTransportFactory() {
3479-
return mockTransportFactory;
3480-
}
3481-
}
34823479

3483-
ManagedChannel mychannel = new CustomBuilder().nameResolverFactory(factory).build();
3480+
ManagedChannelImplBuilder customBuilder = new ManagedChannelImplBuilder(TARGET,
3481+
new ClientTransportFactoryBuilder() {
3482+
@Override public ClientTransportFactory buildClientTransportFactory() {
3483+
return mockTransportFactory;
3484+
}
3485+
},
3486+
null);
3487+
customBuilder.executorPool = executorPool;
3488+
customBuilder.channelz = channelz;
3489+
ManagedChannel mychannel = customBuilder.nameResolverFactory(factory).build();
34843490

34853491
ClientCall<Void, Void> call1 =
34863492
mychannel.newCall(TestMethodDescriptors.voidMethod(), CallOptions.DEFAULT);
@@ -4025,22 +4031,6 @@ public void createResolvingOobChannel() throws Exception {
40254031
}
40264032
}
40274033

4028-
private static final class ChannelBuilder
4029-
extends AbstractManagedChannelImplBuilder<ChannelBuilder> {
4030-
4031-
ChannelBuilder() {
4032-
super(TARGET);
4033-
}
4034-
4035-
@Override protected ClientTransportFactory buildTransportFactory() {
4036-
throw new UnsupportedOperationException();
4037-
}
4038-
4039-
@Override protected int getDefaultPort() {
4040-
return DEFAULT_PORT;
4041-
}
4042-
}
4043-
40444034
private static final class FakeBackoffPolicyProvider implements BackoffPolicy.Provider {
40454035
@Override
40464036
public BackoffPolicy get() {

‎core/src/test/java/io/grpc/internal/ServiceConfigErrorHandlingTest.java‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import io.grpc.NameResolver;
4747
import io.grpc.NameResolver.ConfigOrError;
4848
import io.grpc.Status;
49+
import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider;
50+
import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder;
4951
import java.net.SocketAddress;
5052
import java.net.URI;
5153
import java.util.ArrayList;
@@ -153,7 +155,18 @@ public ConfigOrError parseLoadBalancingPolicyConfig(
153155
private ObjectPool<Executor> balancerRpcExecutorPool;
154156
@Mock
155157
private Executor blockingExecutor;
156-
private ChannelBuilder channelBuilder;
158+
159+
private ManagedChannelImplBuilder channelBuilder = new ManagedChannelImplBuilder(TARGET,
160+
new ClientTransportFactoryBuilder() {
161+
@Override public ClientTransportFactory buildClientTransportFactory() {
162+
throw new UnsupportedOperationException();
163+
}
164+
},
165+
new ChannelBuilderDefaultPortProvider() {
166+
@Override public int getDefaultPort() {
167+
return DEFAULT_PORT;
168+
}
169+
});
157170

158171
private void createChannel(ClientInterceptor... interceptors) {
159172
checkState(channel == null);
@@ -199,14 +212,12 @@ public void setUp() throws Exception {
199212
.thenReturn(timer.getScheduledExecutorService());
200213
when(executorPool.getObject()).thenReturn(executor.getScheduledExecutorService());
201214

202-
channelBuilder =
203-
new ChannelBuilder()
204-
.nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
205-
.defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
206-
.userAgent(USER_AGENT)
207-
.idleTimeout(
208-
AbstractManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
209-
.offloadExecutor(blockingExecutor);
215+
channelBuilder
216+
.nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
217+
.defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
218+
.userAgent(USER_AGENT)
219+
.idleTimeout(ManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
220+
.offloadExecutor(blockingExecutor);
210221
channelBuilder.executorPool = executorPool;
211222
channelBuilder.binlog = null;
212223
channelBuilder.channelz = channelz;
@@ -529,22 +540,6 @@ public void validConfig_thenNoConfig_withDefaultConfig() throws Exception {
529540
verify(mockLoadBalancer, never()).handleNameResolutionError(any(Status.class));
530541
}
531542

532-
private static final class ChannelBuilder
533-
extends AbstractManagedChannelImplBuilder<ChannelBuilder> {
534-
535-
ChannelBuilder() {
536-
super(TARGET);
537-
}
538-
539-
@Override protected ClientTransportFactory buildTransportFactory() {
540-
throw new UnsupportedOperationException();
541-
}
542-
543-
@Override protected int getDefaultPort() {
544-
return DEFAULT_PORT;
545-
}
546-
}
547-
548543
private static final class FakeBackoffPolicyProvider implements BackoffPolicy.Provider {
549544
@Override
550545
public BackoffPolicy get() {

0 commit comments

Comments
 (0)