Swap ThrowableSubject.hasMessage() implementation to use .hasMessageT…

…hat(). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=143129551
google · Dec 29, 2016 · 30a69e3 · 30a69e3
1 parent dcab141
commit 30a69e3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 41 deletions.
diff --git a/core/src/main/java/com/google/common/truth/ThrowableSubject.java b/core/src/main/java/com/google/common/truth/ThrowableSubject.java
@@ -15,7 +15,6 @@
  */
 package com.google.common.truth;
 
-import com.google.common.base.Objects;
 import javax.annotation.Nullable;
 
 /**
@@ -33,15 +32,7 @@ public ThrowableSubject(FailureStrategy failureStrategy, @Nullable Throwable thr
   /** Fails if the subject does not have the given message. */
   // TODO(diamondm): deprecate this in favor of {@code hasMessageThat().isEqualTo(expected)}.
   public void hasMessage(@Nullable String expected) {
-    String actual = actual().getMessage();
-    if (!Objects.equal(expected, actual)) {
-      if (expected != null && actual != null) {
-        failureStrategy.failComparing(
-            actualAsString() + " does not have message <" + expected + ">", expected, actual);
-      } else {
-        fail("has message", expected);
-      }
-    }
+    hasMessageThat().isEqualTo(expected);
   }
 
   public StringSubject hasMessageThat() {

diff --git a/core/src/test/java/com/google/common/truth/ThrowableSubjectTest.java b/core/src/test/java/com/google/common/truth/ThrowableSubjectTest.java
@@ -35,27 +35,6 @@ public void hasMessage() {
     assertThat(npe).hasMessage("message");
   }
 
-  @Test
-  public void hasMessage_null() {
-    assertThat(new NullPointerException()).hasMessage(null);
-    assertThat(new NullPointerException(null)).hasMessage(null);
-  }
-
-  @Test
-  public void hasMessage_failure() {
-    NullPointerException subject = new NullPointerException("message");
-    try {
-      assertThat(subject).hasMessage("foobar");
-      throw new Error("Expected to fail.");
-    } catch (ComparisonFailure expected) {
-      assertThat(expected.getMessage())
-          .isEqualTo(
-              "<java.lang.NullPointerException: message> does not have message <foobar> "
-                  + "expected:<[foobar]> but was:<[message]>");
-      assertThat(expected.getCause()).isEqualTo(subject);
-    }
-  }
-
   @Test
   public void hasMessageThat() {
     NullPointerException npe = new NullPointerException("message");
@@ -84,37 +63,44 @@ public void hasMessageThat_failure() {
   }
 
   @Test
-  public void hasMessage_MessageHasNullMessage_failure() {
+  public void hasMessageThat_MessageHasNullMessage_failure() {
     try {
-      assertThat(new NullPointerException("message")).hasMessage(null);
+      assertThat(new NullPointerException("message")).hasMessageThat().isNull();
       throw new Error("Expected to fail.");
     } catch (AssertionError expected) {
       assertThat(expected.getMessage())
-          .isEqualTo("Not true that <java.lang.NullPointerException: message> has message <null>");
+          .isEqualTo(
+              "Unexpected message for java.lang.NullPointerException: "
+                  + "Not true that <\"message\"> is null");
     }
   }
 
   @Test
-  public void hasMessage_Named_failure() {
+  public void hasMessageThat_Named_failure() {
     try {
-      assertThat(new NullPointerException("message")).named("NPE").hasMessage("foobar");
+      assertThat(new NullPointerException("message"))
+          .named("NPE")
+          .hasMessageThat()
+          .isEqualTo("foobar");
       throw new Error("Expected to fail.");
     } catch (AssertionError expected) {
       assertThat(expected.getMessage())
           .isEqualTo(
-              "NPE (<java.lang.NullPointerException: message>) does not have message "
-                  + "<foobar> expected:<[foobar]> but was:<[message]>");
+              "Unexpected message for NPE(java.lang.NullPointerException): "
+                  + "expected:<[foobar]> but was:<[message]>");
     }
   }
 
   @Test
-  public void hasMessage_NullMessageHasMessage_failure() {
+  public void hasMessageThat_NullMessageHasMessage_failure() {
     try {
-      assertThat(new NullPointerException(null)).hasMessage("message");
+      assertThat(new NullPointerException(null)).hasMessageThat().isEqualTo("message");
       throw new Error("Expected to fail.");
     } catch (AssertionError expected) {
       assertThat(expected.getMessage())
-          .isEqualTo("Not true that <java.lang.NullPointerException> has message <message>");
+          .isEqualTo(
+              "Unexpected message for java.lang.NullPointerException: "
+                  + "Not true that <null> is equal to <\"message\">");
     }
   }