Remove ChattyAssertsTestCase. Use static imports, move the code down the

tree, rewrite most uses of assertPresence. This is a small step towards
migrating the tests to JUnit 4. Depending on inheritance for the assert*
methods is not recommended, and the (old) Asserts class is deprecated in
JUnit 4.

Sorry, there was no good way to do this piecemeal.

--
MOS_MIGRATED_REVID=87154212

1 files changed, 4 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
index 9224b8a6ef..8c01655e10 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
@@ -263,6 +263,10 @@ public class MoreAsserts {
     }
   }
 
+  public static void assertZeroExitCode(int exitCode, String stdout, String stderr) {
+    assertExitCode(0, exitCode, stdout, stderr);
+  }
+
   public static void assertExitCode(int expectedExitCode,
       int exitCode, String stdout, String stderr) {
     if (exitCode != expectedExitCode) {