Migrate Truth subjects from the old fail(String, Object) to the new failWithActual(String, Object), tweaking verbs for the new grammar.

cpovirk · cpovirk · commit 3f1f22201d9c · 2019-04-24T15:36:36.000-04:00
Before: fail("has foo", expected); After: failWithActual("expected to have foo", expected); ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244518456
diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java
@@ -74,7 +74,7 @@ public void isEqualTo(@Nullable Object other) {
     JavaFileObject otherFile = (JavaFileObject) other;
     try {
       if (!asByteSource(actual()).contentEquals(asByteSource(otherFile))) {
-        fail("is equal to", other);
+        failWithActual("expected to be equal to", other);
       }
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -85,7 +85,7 @@ public void isEqualTo(@Nullable Object other) {
   public void hasContents(ByteSource expected) {
     try {
       if (!asByteSource(actual()).contentEquals(expected)) {
-        fail("has contents", expected);
+        failWithActual("expected to have contents", expected);
       }
     } catch (IOException e) {
       throw new RuntimeException(e);
diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java
@@ -350,7 +350,8 @@ public void compilesWithoutError_throws() {
         .that(JavaFileObjects.forResource("HelloWorld-broken.java"))
         .compilesWithoutError();
     AssertionError expected = expectFailure.getFailure();
-    assertThat(expected.getMessage()).startsWith("Compilation produced the following diagnostics:\n");
+    assertThat(expected.getMessage()).startsWith("Compilation produced the following"
+                                                     + " diagnostics:\n");
     assertThat(expected.getMessage()).contains("No files were generated.");
   }
 
@@ -883,7 +884,7 @@ public void generatesFileNamed_failOnFileContents() {
         .withContents(ByteSource.wrap("Bogus".getBytes(UTF_8)));
     AssertionError expected = expectFailure.getFailure();
     assertThat(expected.getMessage()).contains("Foo");
-    assertThat(expected.getMessage()).contains(" has contents ");
+    assertThat(expected.getMessage()).contains(" have contents");
   }
 
   @Test
