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, 3 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index 4ab2c12fae..1e6573fd67 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -15,6 +15,7 @@ package com.google.devtools.build.lib.analysis.actions;
 
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER;
 
+import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionException;
 import com.google.devtools.build.lib.actions.Artifact;
@@ -53,12 +54,12 @@ public class SymlinkActionTest extends BuildViewTestCase {
 
   public void testInputArtifactIsInput() {
     Iterable<Artifact> inputs = action.getInputs();
-    assertEquals(asSet(inputArtifact), asSet(inputs));
+    assertEquals(Sets.newHashSet(inputArtifact), Sets.newHashSet(inputs));
   }
 
   public void testDestinationArtifactIsOutput() {
     Iterable<Artifact> outputs = action.getOutputs();
-    assertEquals(asSet(outputArtifact), asSet(outputs));
+    assertEquals(Sets.newHashSet(outputArtifact), Sets.newHashSet(outputs));
   }
 
   public void testSymlink() throws Exception {