xds: patch unit tests for changes in locality filtering (#6881) (#6885)

Add unit test that covers handling EDS responses containing: locality with 0 endpoint, locality with 0 weight.
grpc · Apr 1, 2020 · cf4121d · cf4121d
1 parent 2581a57
commit cf4121d
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
@@ -98,6 +98,7 @@
 import io.grpc.xds.XdsClientImpl.MessagePrinter;
 import java.io.IOException;
 import java.util.ArrayDeque;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
@@ -1870,9 +1871,12 @@ public void edsResponseWithMatchingResource() {
                         buildLbEndpoint("192.168.0.1", 8080, HealthStatus.HEALTHY, 2)),
                     1, 0),
                 buildLocalityLbEndpoints("region3", "zone3", "subzone3",
+                    Collections.<io.envoyproxy.envoy.api.v2.endpoint.LbEndpoint>emptyList(),
+                    2, 1), /* locality with 0 endpoint */
+                buildLocalityLbEndpoints("region4", "zone4", "subzone4",
                     ImmutableList.of(
                         buildLbEndpoint("192.168.142.5", 80, HealthStatus.UNKNOWN, 5)),
-                    2, 1)),
+                    0, 2) /* locality with 0 weight */),
             ImmutableList.of(
                 buildDropOverload("lb", 200),
                 buildDropOverload("throttle", 1000)))),
@@ -1912,10 +1916,7 @@ public void edsResponseWithMatchingResource() {
                     new LbEndpoint("192.168.0.1", 8080,
                         2, true)), 1, 0),
             new Locality("region3", "zone3", "subzone3"),
-            new LocalityLbEndpoints(
-                ImmutableList.of(
-                    new LbEndpoint("192.168.142.5", 80,
-                        5, true)), 2, 1));
+            new LocalityLbEndpoints(Collections.<LbEndpoint>emptyList(), 2, 1));
   }
 
   @Test