core: Fix CallOptions 'wait for ready' and toString()

buchgr · web-flow · commit 4b127f223165 · 2016-06-13T21:04:25.000+02:00
- CallOptions 'wait for ready' was not passed between with*() calls and therefore
it was not possible to enable it via a stub.

- Properly format custom call options in toString() output.
diff --git a/core/src/main/java/io/grpc/CallOptions.java b/core/src/main/java/io/grpc/CallOptions.java
@@ -359,6 +359,7 @@ private CallOptions(CallOptions other) {
     executor = other.executor;
     compressorName = other.compressorName;
     customOptions = other.customOptions;
+    waitForReady = other.waitForReady;
   }
 
   @Override
@@ -370,7 +371,7 @@ public String toString() {
     toStringHelper.add("affinity", affinity);
     toStringHelper.add("executor", executor != null ? executor.getClass() : null);
     toStringHelper.add("compressorName", compressorName);
-    toStringHelper.add("customOptions", Arrays.toString(customOptions));
+    toStringHelper.add("customOptions", Arrays.deepToString(customOptions));
     toStringHelper.add("waitForReady", isWaitForReady());
 
     return toStringHelper.toString();
diff --git a/core/src/test/java/io/grpc/CallOptionsTest.java b/core/src/test/java/io/grpc/CallOptionsTest.java
@@ -56,19 +56,24 @@
 @RunWith(JUnit4.class)
 public class CallOptionsTest {
   private String sampleAuthority = "authority";
+  private String sampleCompressor = "compressor";
   private Deadline.Ticker ticker = new DeadlineTest.FakeTicker();
   private Deadline sampleDeadline = Deadline.after(1, NANOSECONDS, ticker);
   private Key<String> sampleKey = Attributes.Key.of("sample");
   private Attributes sampleAffinity = Attributes.newBuilder().set(sampleKey, "blah").build();
   private CallCredentials sampleCreds = mock(CallCredentials.class);
+  private CallOptions.Key<String> option1 = CallOptions.Key.of("option1", "default");
+  private CallOptions.Key<String> option2 = CallOptions.Key.of("option2", "default");
   private CallOptions allSet = CallOptions.DEFAULT
       .withAuthority(sampleAuthority)
       .withDeadline(sampleDeadline)
       .withAffinity(sampleAffinity)
       .withCredentials(sampleCreds)
-      .withWaitForReady();
-  private CallOptions.Key<String> option1 = CallOptions.Key.of("option1", "default");
-  private CallOptions.Key<String> option2 = CallOptions.Key.of("option2", "default");
+      .withCompression(sampleCompressor)
+      .withWaitForReady()
+      .withExecutor(directExecutor())
+      .withOption(option1, "value1")
+      .withOption(option2, "value2");
 
   @Test
   public void defaultsAreAllNull() {
@@ -77,6 +82,7 @@ public void defaultsAreAllNull() {
     assertThat(CallOptions.DEFAULT.getAffinity()).isEqualTo(Attributes.EMPTY);
     assertThat(CallOptions.DEFAULT.getExecutor()).isNull();
     assertThat(CallOptions.DEFAULT.getCredentials()).isNull();
+    assertThat(CallOptions.DEFAULT.getCompressor()).isNull();
     assertThat(CallOptions.DEFAULT.isWaitForReady()).isFalse();
   }
 
@@ -93,6 +99,10 @@ public void allWiths() {
     assertThat(allSet.getDeadline()).isSameAs(sampleDeadline);
     assertThat(allSet.getAffinity()).isSameAs(sampleAffinity);
     assertThat(allSet.getCredentials()).isSameAs(sampleCreds);
+    assertThat(allSet.getCompressor()).isSameAs(sampleCompressor);
+    assertThat(allSet.getExecutor()).isSameAs(directExecutor());
+    assertThat(allSet.getOption(option1)).isSameAs("value1");
+    assertThat(allSet.getOption(option2)).isSameAs("value2");
     assertThat(allSet.isWaitForReady()).isTrue();
   }
 
@@ -150,8 +160,8 @@ public void withDeadlineAfter() {
   public void toStringMatches_noDeadline_default() {
     String expected = "CallOptions{deadline=null, authority=authority, callCredentials=null, "
         + "affinity={sample=blah}, "
-        + "executor=class io.grpc.internal.SerializingExecutor, compressorName=null, "
-        + "customOptions=[], waitForReady=false}";
+        + "executor=class io.grpc.internal.SerializingExecutor, compressorName=compressor, "
+        + "customOptions=[[option2, value2], [option1, value1]], waitForReady=true}";
     String actual = allSet
         .withDeadline(null)
         .withExecutor(new SerializingExecutor(directExecutor()))
