Remove some methods from ChattyAssertsTestCase - some are inlined, and some

are unused.

--
MOS_MIGRATED_REVID=87139146

1 files changed, 1 insertions, 34 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/ChattyAssertsTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/ChattyAssertsTestCase.java
index f17d81ead9..6c5b1e8550 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/ChattyAssertsTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/ChattyAssertsTestCase.java
@@ -80,43 +80,17 @@ public abstract class ChattyAssertsTestCase extends TestCase {
     assertEquals(null, expected, actual);
   }
 
-  /**
-   * Asserts that two Strings are equal considering the line separator to be \n
-   * independently of the operating system.
-   */
-  public static void assertEqualsUnifyingLineEnds(String expected, String actual) {
-    MoreAsserts.assertEqualsUnifyingLineEnds(expected, actual);
-  }
-
   private static void chattyFailNotEquals(String message, Object expected,
       Object actual) {
     fail(MoreAsserts.chattyFormat(message, expected, actual));
   }
 
-  /**
-   * Asserts that {@code e}'s exception message contains each of {@code strings}
-   * <b>surrounded by single quotation marks</b>.
-   */
-  public static void assertMessageContainsWordsWithQuotes(Exception e,
-                                                          String... strings) {
-    assertContainsWordsWithQuotes(e.getMessage(), strings);
-  }
-
-  /**
-   * Asserts that {@code message} contains each of {@code strings}
-   * <b>surrounded by single quotation marks</b>.
-   */
-  public static void assertContainsWordsWithQuotes(String message,
-                                                   String... strings) {
-    MoreAsserts.assertContainsWordsWithQuotes(message, strings);
-  }
-
   public static void assertNonZeroExitCode(int exitCode, String stdout, String stderr) {
     MoreAsserts.assertNonZeroExitCode(exitCode, stdout, stderr);
   }
 
   public static void assertZeroExitCode(int exitCode, String stdout, String stderr) {
-    assertExitCode(0, exitCode, stdout, stderr);
+    MoreAsserts.assertExitCode(0, exitCode, stdout, stderr);
   }
 
   public static void assertExitCode(ExitCode expectedExitCode,
@@ -176,13 +150,6 @@ public abstract class ChattyAssertsTestCase extends TestCase {
   }
 
   /**
-   * Returns the arguments given as varargs as a set of sorted Strings.
-   */
-  protected static Set<String> asStringSet(Iterable<?> collection) {
-    return MoreAsserts.asStringSet(collection);
-  }
-
-  /**
    * An equivalence relation for Collection, based on mapping to Set.
    *
    * Oft-forgotten fact: for all x in Set, y in List, !x.equals(y) even if