From a702397903f7bbe47ae9352688f7d8cff04a0094 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Fri, 14 Apr 2023 08:00:00 -0700 Subject: [PATCH] Revert "testing: RpcBehaviorLoadBalancingProvider to use acceptResolvedAddresses() (#10030)" This reverts commit 17e1fcb393784179cb3fc5e9dc052979d568dcae. --- .../integration/RpcBehaviorLoadBalancerProvider.java | 4 ++-- .../integration/RpcBehaviorLoadBalancerProviderTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java index 928819dcdf..83c416765e 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java @@ -111,10 +111,10 @@ public class RpcBehaviorLoadBalancerProvider extends LoadBalancerProvider { } @Override - public boolean acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) { + public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { helper.setRpcBehavior( ((RpcBehaviorConfig) resolvedAddresses.getLoadBalancingPolicyConfig()).rpcBehavior); - return delegateLb.acceptResolvedAddresses(resolvedAddresses); + delegateLb.handleResolvedAddresses(resolvedAddresses); } } diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java index 6b02627417..e19208b888 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java @@ -79,12 +79,12 @@ public class RpcBehaviorLoadBalancerProviderTest { } @Test - public void acceptResolvedAddressesDelegated() { + public void handleResolvedAddressesDelegated() { RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(new RpcBehaviorHelper(mockHelper), mockDelegateLb); ResolvedAddresses resolvedAddresses = buildResolvedAddresses(buildConfig()); - assertThat(lb.acceptResolvedAddresses(resolvedAddresses)).isFalse(); - verify(mockDelegateLb).acceptResolvedAddresses(resolvedAddresses); + lb.handleResolvedAddresses(resolvedAddresses); + verify(mockDelegateLb).handleResolvedAddresses(resolvedAddresses); } @Test