api: Revert CallOptionsTest refactor from this PR

Author: stagegrowth

api/src/test/java/io/grpc/CallOptionsTest.java

@@ -29,9 +29,7 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
-import com.google.common.truth.Fact;
-import com.google.common.truth.FailureMetadata;
-import com.google.common.truth.Subject;
+import com.google.common.base.Objects;
 import io.grpc.ClientStreamTracer.StreamInfo;
 import io.grpc.internal.SerializingExecutor;
 import java.time.Duration;
@@ -108,15 +106,17 @@ public void allWiths() {
 
   @Test
   public void noStrayModifications() {
-    assertAbout(callOptions()).that(allSet.withAuthority("blah").withAuthority(sampleAuthority))
-        .isEquivalentTo(allSet);
-    assertAbout(callOptions()).that(
-            allSet.withDeadline(Deadline.after(314, NANOSECONDS)).withDeadline(sampleDeadline))
-        .isEquivalentTo(allSet);
-    assertAbout(callOptions()).that(
+    assertThat(equal(allSet, allSet.withAuthority("blah").withAuthority(sampleAuthority)))
+        .isTrue();
+    assertThat(
+        equal(allSet,
+            allSet.withDeadline(Deadline.after(314, NANOSECONDS)).withDeadline(sampleDeadline)))
+        .isTrue();
+    assertThat(
+        equal(allSet,
             allSet.withCallCredentials(mock(CallCredentials.class))
-                .withCallCredentials(sampleCreds))
-        .isEquivalentTo(allSet);
+            .withCallCredentials(sampleCreds)))
+        .isTrue();
   }
 
   @Test
@@ -265,32 +265,12 @@ public void getWaitForReady() {
     assertSame(CallOptions.DEFAULT.withoutWaitForReady().getWaitForReady(), Boolean.FALSE);
   }
 
-  private static Subject.Factory<CallOptionsSubject, CallOptions> callOptions() {
-    return CallOptionsSubject::new;
-  }
-
-  private static final class CallOptionsSubject extends Subject {
-
-    private final CallOptions actual;
-
-    private CallOptionsSubject(FailureMetadata metadata, CallOptions actual) {
-      super(metadata, actual);
-      this.actual = actual;
-    }
-
-    public void isEquivalentTo(CallOptions expected) {
-      if (actual == null) {
-        failWithActual("expected", expected);
-        return;
-      }
-      if (expected == null) {
-        failWithoutActual(Fact.simpleFact("expected non-null CallOptions"));
-        return;
-      }
-      check("deadline").that(actual.getDeadline()).isEqualTo(expected.getDeadline());
-      check("authority").that(actual.getAuthority()).isEqualTo(expected.getAuthority());
-      check("credentials").that(actual.getCredentials()).isEqualTo(expected.getCredentials());
-    }
+  // Only used in noStrayModifications()
+  // TODO(carl-mastrangelo): consider making a CallOptionsSubject for Truth.
+  private static boolean equal(CallOptions o1, CallOptions o2) {
+    return Objects.equal(o1.getDeadline(), o2.getDeadline())
+        && Objects.equal(o1.getAuthority(), o2.getAuthority())
+        && Objects.equal(o1.getCredentials(), o2.getCredentials());
   }
 
   private static class FakeTicker extends Deadline.Ticker {