Use Truth instead of custom code.

--
MOS_MIGRATED_REVID=87595869

1 files changed, 4 insertions, 8 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
index 11750fdf3a..d6642e8dac 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.lib.testutil;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.common.io.Files;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventCollector;
@@ -189,10 +191,7 @@ public abstract class FoundationTestCase extends TestCase {
    * assertion.
    */
   protected void assertEndsWith(String expectedSuffix, String actual) {
-    if (!actual.endsWith(expectedSuffix)) {
-      fail("\"" + actual + "\" does not end with "
-           + "\"" + expectedSuffix + "\"");
-    }
+    assertThat(actual).endsWith(expectedSuffix);
   }
 
   /**
@@ -200,10 +199,7 @@ public abstract class FoundationTestCase extends TestCase {
    * assertion.
    */
   protected void assertStartsWith(String expectedPrefix, String actual) {
-    if (!actual.startsWith(expectedPrefix)) {
-      fail("\"" + actual + "\" does not start with "
-           + "\"" + expectedPrefix + "\"");
-    }
+    assertThat(actual).startsWith(expectedPrefix);
   }
 
   // Mix-in assertions: