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

xds: Remove unnecessary subchannel creation by helper, use mocked subchannels directly. (#5977)

This commit is contained in:
Chengyuan Zhang 2019-07-10 16:57:02 -07:00 committed by GitHub
parent e341d4c655
commit ce830bc3bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xds/src/test/java/io/grpc/xds/LocalityStoreTest.java
View File

@ -43,7 +43,6 @@ import io.grpc.ClientStreamTracer;
import io.grpc.ConnectivityState; import io.grpc.ConnectivityState;
import io.grpc.EquivalentAddressGroup; import io.grpc.EquivalentAddressGroup;
import io.grpc.LoadBalancer; import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.CreateSubchannelArgs;
import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.Helper;
import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs; import io.grpc.LoadBalancer.PickSubchannelArgs;
@ -201,7 +200,6 @@ public class LocalityStoreTest {
@Before @Before
public void setUp() { public void setUp() {
doReturn(mock(ChannelLogger.class)).when(helper).getChannelLogger(); doReturn(mock(ChannelLogger.class)).when(helper).getChannelLogger();
doReturn(mock(Subchannel.class)).when(helper).createSubchannel(any(CreateSubchannelArgs.class));
doReturn(syncContext).when(helper).getSynchronizationContext(); doReturn(syncContext).when(helper).getSynchronizationContext();
when(orcaOobUtil.newOrcaReportingHelperWrapper(any(Helper.class), when(orcaOobUtil.newOrcaReportingHelperWrapper(any(Helper.class),
any(OrcaOobReportListener.class))) any(OrcaOobReportListener.class)))
@ -424,11 +422,7 @@ public class LocalityStoreTest {
any(ConnectivityState.class), any(SubchannelPicker.class)); any(ConnectivityState.class), any(SubchannelPicker.class));
// subchannel12 goes to CONNECTING // subchannel12 goes to CONNECTING
CreateSubchannelArgs createSubchannelArgs = final Subchannel subchannel12 = mock(Subchannel.class);
CreateSubchannelArgs.newBuilder().setAddresses(ImmutableList.of(eag12)).build();
final Subchannel subchannel12 =
childHelpers.get("sz1").createSubchannel(createSubchannelArgs);
verify(helper).createSubchannel(createSubchannelArgs);
SubchannelPicker subchannelPicker12 = new SubchannelPicker() { SubchannelPicker subchannelPicker12 = new SubchannelPicker() {
@Override @Override
public PickResult pickSubchannel(PickSubchannelArgs args) { public PickResult pickSubchannel(PickSubchannelArgs args) {
@ -444,11 +438,7 @@ public class LocalityStoreTest {
.isEqualTo(PickResult.withNoResult()); .isEqualTo(PickResult.withNoResult());
// subchannel31 goes to READY // subchannel31 goes to READY
createSubchannelArgs = final Subchannel subchannel31 = mock(Subchannel.class);
CreateSubchannelArgs.newBuilder().setAddresses(ImmutableList.of(eag31)).build();
final Subchannel subchannel31 =
childHelpers.get("sz3").createSubchannel(createSubchannelArgs);
verify(helper).createSubchannel(createSubchannelArgs);
SubchannelPicker subchannelPicker31 = new SubchannelPicker() { SubchannelPicker subchannelPicker31 = new SubchannelPicker() {
@Override @Override
public PickResult pickSubchannel(PickSubchannelArgs args) { public PickResult pickSubchannel(PickSubchannelArgs args) {
@ -559,10 +549,7 @@ public class LocalityStoreTest {
inOrder.verify(loadStatsStore).recordDroppedRequest(eq("lb")); inOrder.verify(loadStatsStore).recordDroppedRequest(eq("lb"));
// subchannel12 goes to READY // subchannel12 goes to READY
CreateSubchannelArgs createSubchannelArgs = final Subchannel subchannel12 = mock(Subchannel.class);
CreateSubchannelArgs.newBuilder().setAddresses(ImmutableList.of(eag12)).build();
final Subchannel subchannel12 = childHelpers.get("sz1").createSubchannel(createSubchannelArgs);
verify(helper).createSubchannel(createSubchannelArgs);
SubchannelPicker subchannelPicker12 = new SubchannelPicker() { SubchannelPicker subchannelPicker12 = new SubchannelPicker() {
@Override @Override
public PickResult pickSubchannel(PickSubchannelArgs args) { public PickResult pickSubchannel(PickSubchannelArgs args) {