From 18ba41724105c36de4905a2e3b7b99e288a18c52 Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Wed, 11 Oct 2017 13:54:16 -0700 Subject: [PATCH] core: add drop to hashCode() and equals() for PickResult (#3570) --- core/src/main/java/io/grpc/LoadBalancer.java | 5 +- .../test/java/io/grpc/LoadBalancerTest.java | 114 ++++++++++++++++++ 2 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 core/src/test/java/io/grpc/LoadBalancerTest.java diff --git a/core/src/main/java/io/grpc/LoadBalancer.java b/core/src/main/java/io/grpc/LoadBalancer.java index 9a84860887..c3ff9f9564 100644 --- a/core/src/main/java/io/grpc/LoadBalancer.java +++ b/core/src/main/java/io/grpc/LoadBalancer.java @@ -408,7 +408,7 @@ public abstract class LoadBalancer { @Override public int hashCode() { - return Objects.hashCode(subchannel, status, streamTracerFactory); + return Objects.hashCode(subchannel, status, streamTracerFactory, drop); } /** @@ -422,7 +422,8 @@ public abstract class LoadBalancer { } PickResult that = (PickResult) other; return Objects.equal(subchannel, that.subchannel) && Objects.equal(status, that.status) - && Objects.equal(streamTracerFactory, that.streamTracerFactory); + && Objects.equal(streamTracerFactory, that.streamTracerFactory) + && drop == that.drop; } } diff --git a/core/src/test/java/io/grpc/LoadBalancerTest.java b/core/src/test/java/io/grpc/LoadBalancerTest.java new file mode 100644 index 0000000000..69526095f1 --- /dev/null +++ b/core/src/test/java/io/grpc/LoadBalancerTest.java @@ -0,0 +1,114 @@ +/* + * Copyright 2017, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.grpc; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; + +import io.grpc.ClientStreamTracer; +import io.grpc.LoadBalancer.PickResult; +import io.grpc.LoadBalancer.Subchannel; +import io.grpc.Status; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for the inner classes in {@link LoadBalancer}. */ +@RunWith(JUnit4.class) +public class LoadBalancerTest { + private final Subchannel subchannel = mock(Subchannel.class); + private final Subchannel subchannel2 = mock(Subchannel.class); + private final ClientStreamTracer.Factory tracerFactory = mock(ClientStreamTracer.Factory.class); + private final Status status = Status.UNAVAILABLE.withDescription("for test"); + private final Status status2 = Status.UNAVAILABLE.withDescription("for test 2"); + + @Test + public void pickResult_withSubchannel() { + PickResult result = PickResult.withSubchannel(subchannel); + assertThat(result.getSubchannel()).isSameAs(subchannel); + assertThat(result.getStatus()).isSameAs(Status.OK); + assertThat(result.getStreamTracerFactory()).isNull(); + assertThat(result.isDrop()).isFalse(); + } + + @Test + public void pickResult_withSubchannelAndTracer() { + PickResult result = PickResult.withSubchannel(subchannel, tracerFactory); + assertThat(result.getSubchannel()).isSameAs(subchannel); + assertThat(result.getStatus()).isSameAs(Status.OK); + assertThat(result.getStreamTracerFactory()).isSameAs(tracerFactory); + assertThat(result.isDrop()).isFalse(); + } + + @Test + public void pickResult_withNoResult() { + PickResult result = PickResult.withNoResult(); + assertThat(result.getSubchannel()).isNull(); + assertThat(result.getStatus()).isSameAs(Status.OK); + assertThat(result.getStreamTracerFactory()).isNull(); + assertThat(result.isDrop()).isFalse(); + } + + @Test + public void pickResult_withError() { + PickResult result = PickResult.withError(status); + assertThat(result.getSubchannel()).isNull(); + assertThat(result.getStatus()).isSameAs(status); + assertThat(result.getStreamTracerFactory()).isNull(); + assertThat(result.isDrop()).isFalse(); + } + + @Test + public void pickResult_withDrop() { + PickResult result = PickResult.withDrop(status); + assertThat(result.getSubchannel()).isNull(); + assertThat(result.getStatus()).isSameAs(status); + assertThat(result.getStreamTracerFactory()).isNull(); + assertThat(result.isDrop()).isTrue(); + } + + @Test + public void pickResult_equals() { + PickResult sc1 = PickResult.withSubchannel(subchannel); + PickResult sc2 = PickResult.withSubchannel(subchannel); + PickResult sc3 = PickResult.withSubchannel(subchannel, tracerFactory); + PickResult sc4 = PickResult.withSubchannel(subchannel2); + PickResult nr = PickResult.withNoResult(); + PickResult error1 = PickResult.withError(status); + PickResult error2 = PickResult.withError(status2); + PickResult error3 = PickResult.withError(status2); + PickResult drop1 = PickResult.withDrop(status); + PickResult drop2 = PickResult.withDrop(status); + PickResult drop3 = PickResult.withDrop(status2); + + assertThat(sc1).isNotEqualTo(nr); + assertThat(sc1).isNotEqualTo(error1); + assertThat(sc1).isNotEqualTo(drop1); + assertThat(sc1).isEqualTo(sc2); + assertThat(sc1).isNotEqualTo(sc3); + assertThat(sc1).isNotEqualTo(sc4); + + assertThat(error1).isNotEqualTo(error2); + assertThat(error2).isEqualTo(error3); + + assertThat(drop1).isEqualTo(drop2); + assertThat(drop1).isNotEqualTo(drop3); + + assertThat(error1.getStatus()).isEqualTo(drop1.getStatus()); + assertThat(error1).isNotEqualTo(drop1); + } +}