Remove all imports of org.junit.Assert except for static imports of #fail().

RELNOTES: None.
PiperOrigin-RevId: 157685150

12 files changed, 45 insertions, 43 deletions

diff --git a/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java
index 2026aafb09..4cdc174ebf 100644
--- a/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java
@@ -13,13 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.jimfs.Jimfs;
 import com.google.common.truth.Truth;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -127,7 +128,7 @@ public class DependencyAndroidDataTest {
   @Test public void flagNoManifestFails() {
     try {
       DependencyAndroidData.valueOf(":::r.txt", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -135,7 +136,7 @@ public class DependencyAndroidDataTest {
   @Test public void flagMissingManifestFails() {
     try {
       DependencyAndroidData.valueOf("::Manifest.xml:r.txt:symbols.bin", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -143,7 +144,7 @@ public class DependencyAndroidDataTest {
   @Test public void flagNoRTxtFails() {
     try {
       DependencyAndroidData.valueOf("::AndroidManifest.xml:", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -151,7 +152,7 @@ public class DependencyAndroidDataTest {
   @Test public void flagMissingRTxtFails() {
     try {
       DependencyAndroidData.valueOf("::Manifest.xml:missing_file", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -159,7 +160,7 @@ public class DependencyAndroidDataTest {
   @Test public void flagMissingSymbolsFails() {
     try {
       DependencyAndroidData.valueOf("::Manifest.xml:r.txt:missing_file", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java
index 313466c252..4f71be74ee 100644
--- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.android;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
@@ -33,7 +34,6 @@ import com.google.devtools.build.android.xml.StyleableXmlResourceValue;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -603,7 +603,7 @@ public class ParsedAndroidDataTest {
             .createManifest("AndroidManifest.xml", "com.xyz", "");
     try {
       builder.buildParsed();
-      Assert.fail("expected MergingException");
+      fail("expected MergingException");
     } catch (MergingException e) {
       assertThat(e).hasMessageThat().isEqualTo("3 Parse Error(s)");
       String combinedSuberrors = Joiner.on('\n').join(e.getSuppressed());
@@ -647,7 +647,7 @@ public class ParsedAndroidDataTest {
             .createManifest("AndroidManifest.xml", "com.carroll.lewis", "");
     try {
       builder.buildParsed();
-      Assert.fail("expected exception");
+      fail("expected MergingException");
     } catch (MergingException e) {
       assertThat(e).hasMessageThat().isEqualTo("5 Parse Error(s)");
       String combinedSuberrors = Joiner.on('\n').join(e.getSuppressed());
diff --git a/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java
index c40f90438c..eb9837f39f 100644
--- a/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java
@@ -13,13 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.jimfs.Jimfs;
 import com.google.common.truth.Truth;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -106,7 +107,7 @@ public class SerializedAndroidDataTest {
   public void flagNoLabelFails() {
     try {
       SerializedAndroidData.valueOf(";;symbols.bin", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
diff --git a/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java
index 0ee7b25b4f..2a662f7430 100644
--- a/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java
@@ -13,13 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.jimfs.Jimfs;
 import com.google.common.truth.Truth;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -89,7 +90,7 @@ public class UnvalidatedAndroidDataTest {
   @Test public void flagNoManifestFails() {
     try {
       UnvalidatedAndroidData.valueOf("::", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -97,7 +98,7 @@ public class UnvalidatedAndroidDataTest {
   @Test public void flagMissingManifestFails() {
     try {
       UnvalidatedAndroidData.valueOf("::Manifest.xml", fileSystem);
-      Assert.fail("expected exception for bad flag format");
+      fail("expected exception for bad flag format");
     } catch (IllegalArgumentException expected) {
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java
index 2175ae5fec..a53a20db21 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java
@@ -15,6 +15,7 @@ package com.google.devtools.build.lib.analysis;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assert.fail;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
@@ -31,7 +32,6 @@ import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.util.Pair;
 import java.util.HashMap;
 import java.util.HashSet;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -228,7 +228,7 @@ public class AspectCollectionTest {
           .create(
               ImmutableList.of(a2, a1, a2, a3),
               ImmutableSet.of(a3.getDescriptor()));
-      Assert.fail();
+      fail();
     } catch (AspectCycleOnPathException e) {
       assertThat(e.getAspect()).isEqualTo(a2.getDescriptor());
       assertThat(e.getPreviousAspect()).isEqualTo(a1.getDescriptor());
@@ -250,7 +250,7 @@ public class AspectCollectionTest {
           .create(
               ImmutableList.of(a2, a1, a2, a3),
               ImmutableSet.of(a3.getDescriptor()));
-      Assert.fail();
+      fail();
     } catch (AspectCycleOnPathException e) {
       assertThat(e.getAspect()).isEqualTo(a2.getDescriptor());
       assertThat(e.getPreviousAspect()).isEqualTo(a1.getDescriptor());
@@ -298,7 +298,7 @@ public class AspectCollectionTest {
           .create(
               ImmutableList.of(a2, a1, a2, a3),
               ImmutableSet.of(a3.getDescriptor()));
-      Assert.fail();
+      fail();
     } catch (AspectCycleOnPathException e) {
       assertThat(e.getAspect()).isEqualTo(a2.getDescriptor());
       assertThat(e.getPreviousAspect()).isEqualTo(a1.getDescriptor());
@@ -320,7 +320,7 @@ public class AspectCollectionTest {
           .create(
               ImmutableList.of(a2, a1, a2, a3),
               ImmutableSet.of(a3.getDescriptor()));
-      Assert.fail();
+      fail();
     } catch (AspectCycleOnPathException e) {
       assertThat(e.getAspect()).isEqualTo(a2.getDescriptor());
       assertThat(e.getPreviousAspect()).isEqualTo(a1.getDescriptor());
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 2b9166835f..f6a34e9fc3 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.skylark;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
@@ -57,7 +58,6 @@ import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import java.util.Collection;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -101,7 +101,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase {
     try {
       evalAndExport(
           "def impl(ctx): return", "r = rule(impl, attrs = {'tags': attr.string_list()})");
-      Assert.fail("Expected error '"
+      fail("Expected error '"
           + "There is already a built-in attribute 'tags' which cannot be overridden"
           + "' but got no error");
     } catch (AssertionError e) {
@@ -117,7 +117,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase {
     try {
       evalAndExport(
           "def impl(ctx): return", "r = rule(impl, attrs = {'name': attr.string()})");
-      Assert.fail("Expected error '"
+      fail("Expected error '"
           + "There is already a built-in attribute 'name' which cannot be overridden"
           + "' but got no error");
     } catch (AssertionError e) {
@@ -1371,7 +1371,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase {
 
     try {
       createRuleContext("//third_party/foo:main");
-      Assert.fail();
+      fail();
     } catch (AssertionError e) {
       assertThat(e)
           .hasMessageThat()
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
index 94e50ae811..edf1edf8c2 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.syntax;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -25,7 +26,6 @@ import com.google.devtools.build.lib.syntax.EvalUtils.ComparisonException;
 import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
 import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -135,7 +135,7 @@ public class EvalUtilsTest extends EvaluationTestCase {
         if (i != j) {
           try {
             EvalUtils.SKYLARK_COMPARATOR.compare(objects[i], objects[j]);
-            Assert.fail("Shouldn't have compared different types");
+            fail("Shouldn't have compared different types");
           } catch (ComparisonException e) {
             // expected
           }
@@ -148,7 +148,7 @@ public class EvalUtilsTest extends EvaluationTestCase {
   public void testComparatorWithNones() throws Exception {
     try {
       EvalUtils.SKYLARK_COMPARATOR.compare(Runtime.NONE, Runtime.NONE);
-      Assert.fail("Shouldn't have compared nones");
+      fail("Shouldn't have compared nones");
     } catch (ComparisonException e) {
       // expected
     }
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java
index 58fef456fc..b96b6ad06b 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.syntax;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -24,7 +25,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -48,7 +48,7 @@ public class SkylarkNestedSetTest extends EvaluationTestCase {
     env = newEnvironmentWithSkylarkOptions("--incompatible_disallow_set_constructor=true");
     try {
       eval("s = set([1, 2, 3], order='postorder')");
-      Assert.fail("`set` should have failed");
+      fail("`set` should have failed");
     } catch (EvalException e) {
       assertThat(e).hasMessageThat().contains("The `set` constructor for depsets is deprecated");
     }
@@ -67,7 +67,7 @@ public class SkylarkNestedSetTest extends EvaluationTestCase {
     assertThat(get("s").getSet(Object.class)).containsExactly("a", "b").inOrder();
     try {
       get("s").getSet(Integer.class);
-      Assert.fail("getSet() with wrong type should have raised IllegalArgumentException");
+      fail("getSet() with wrong type should have raised IllegalArgumentException");
     } catch (IllegalArgumentException expected) {
     }
   }
@@ -80,7 +80,7 @@ public class SkylarkNestedSetTest extends EvaluationTestCase {
     assertThat(get("s").toCollection()).containsExactly("a", "b").inOrder();
     try {
       get("s").toCollection(Integer.class);
-      Assert.fail("toCollection() with wrong type should have raised IllegalArgumentException");
+      fail("toCollection() with wrong type should have raised IllegalArgumentException");
     } catch (IllegalArgumentException expected) {
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
index d75c1bd2c9..d68308c19c 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
@@ -15,9 +15,9 @@ package com.google.devtools.build.lib.vfs;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assert.fail;
 
 import java.io.File;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -141,7 +141,7 @@ public class PathFragmentWindowsTest {
   private void assertCantComputeRelativeTo(String path, String relativeTo) throws Exception {
     try {
       PathFragment.create(path).relativeTo(relativeTo);
-      Assert.fail("expected failure");
+      fail("expected failure");
     } catch (Exception e) {
       assertThat(e).hasMessageThat().contains("is not beneath");
     }
diff --git a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java
index 27261adea8..cd90fff594 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.windows;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.windows.WindowsFileSystem.SHORT_NAME_MATCHER;
+import static org.junit.Assert.fail;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -38,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -214,7 +214,7 @@ public class WindowsFileSystemTest {
         .isFalse();
     try {
       WindowsFileSystem.isJunction(new File(root, "non-existent"));
-      Assert.fail("expected failure");
+      fail("expected failure");
     } catch (IOException e) {
       assertThat(e.getMessage()).contains("cannot find");
     }
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
index e510cbfacd..8842f84b21 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -65,7 +65,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nullable;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -2513,7 +2512,7 @@ public class MemoizingEvaluatorTest {
         public void runTest() {
           try {
             tester.eval(/*keepGoing=*/false, tops.toArray(new SkyKey[0]));
-            Assert.fail();
+            fail();
           } catch (InterruptedException e) {
             // Expected.
           }
@@ -2887,7 +2886,7 @@ public class MemoizingEvaluatorTest {
     tester.invalidate();
     try {
       tester.eval(/*keepGoing=*/false, value);
-      Assert.fail();
+      fail();
     } catch (InterruptedException e) {
       // Expected.
     }
@@ -2986,7 +2985,7 @@ public class MemoizingEvaluatorTest {
     tester.invalidate();
     try {
       tester.eval(/*keepGoing=*/false, tops.toArray(new SkyKey[0]));
-      Assert.fail();
+      fail();
     } catch (InterruptedException e) {
       // Expected.
     }
@@ -3766,7 +3765,7 @@ public class MemoizingEvaluatorTest {
     tester.differencer.inject(ImmutableMap.of(key, val));
     try {
       tester.evalAndGet("value");
-      Assert.fail("injection over value with deps should have failed");
+      fail("injection over value with deps should have failed");
     } catch (IllegalStateException e) {
       assertThat(e).hasMessage(
           "existing entry for " + NODE_TYPE.getName() + ":value has deps: "
@@ -3785,7 +3784,7 @@ public class MemoizingEvaluatorTest {
     tester.differencer.inject(ImmutableMap.of(key, val));
     try {
       tester.evalAndGet("value");
-      Assert.fail("injection over value with deps should have failed");
+      fail("injection over value with deps should have failed");
     } catch (IllegalStateException e) {
       assertThat(e).hasMessage(
           "existing entry for " + NODE_TYPE.getName() + ":value has deps: "
diff --git a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java
index e61aef104d..d783795b2d 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java
@@ -14,12 +14,12 @@
 package com.google.devtools.build.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -110,7 +110,7 @@ public class ReverseDepsUtilityTest {
     ReverseDepsUtility.removeReverseDep(example, key);
     try {
       ReverseDepsUtility.getReverseDeps(example);
-      Assert.fail();
+      fail();
     } catch (IllegalStateException expected) {
     }
   }
@@ -127,7 +127,7 @@ public class ReverseDepsUtilityTest {
     ReverseDepsUtility.checkReverseDep(example, fixedKey);
     try {
       ReverseDepsUtility.checkReverseDep(example, fixedKey);
-      Assert.fail();
+      fail();
     } catch (IllegalStateException expected) {
     }
   }