Statically import MoreAsserts.assertThrows everywhere.

This will someday help us migrate to Junit's version.

PiperOrigin-RevId: 246368991

src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
index d0b235d..da98c59 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
@@ -26,7 +26,6 @@
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -212,10 +211,10 @@
                 .getSourceArtifact(PathFragment.create("/foo"), absoluteRoot)
                 .getExecPath())
         .isEqualTo(PathFragment.create("/foo"));
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> artifactFactory.getSourceArtifact(PathFragment.create("/foo"), clientRoot));
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> artifactFactory.getSourceArtifact(PathFragment.create("foo"), absoluteRoot));
   }

src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
index cc3587e..09bdf59 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
@@ -32,7 +32,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.AutoRegistry;
 import com.google.devtools.build.lib.skyframe.serialization.ObjectCodecs;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
@@ -297,7 +296,7 @@
   @Test
   public void testWeirdArtifact() throws Exception {
     Path execRoot = scratch.getFileSystem().getPath("/");
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () ->
             new Artifact(

src/test/java/com/google/devtools/build/lib/actions/SingleStringArgFormatterTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/actions/SingleStringArgFormatterTest.java b/src/test/java/com/google/devtools/build/lib/actions/SingleStringArgFormatterTest.java
index 2c042a6..c577496 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/SingleStringArgFormatterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/SingleStringArgFormatterTest.java
@@ -16,8 +16,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.actions.SingleStringArgFormatter.format;
 import static com.google.devtools.build.lib.actions.SingleStringArgFormatter.isValid;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -48,7 +48,7 @@
     assertThat(format("hello %s, hello", "world")).isEqualTo("hello world, hello");
     assertThat(format("hello %s, hello", "world")).isEqualTo("hello world, hello");
     assertThat(format("hello %%s %s", "world")).isEqualTo("hello %%s world");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> format("hello", "hello"));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> format("hello %s %s", "hello"));
+    assertThrows(IllegalArgumentException.class, () -> format("hello", "hello"));
+    assertThrows(IllegalArgumentException.class, () -> format("hello %s %s", "hello"));
   }
 }

src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsCompareFragmentsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsCompareFragmentsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsCompareFragmentsTest.java
index 53edafd..f4a5161 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsCompareFragmentsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsCompareFragmentsTest.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.analysis.config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
@@ -23,7 +24,6 @@
 import com.google.devtools.build.lib.skyframe.trimming.ConfigurationComparer;
 import com.google.devtools.build.lib.skyframe.trimming.TrimmableTestConfigurationFragments.AOptions;
 import com.google.devtools.build.lib.skyframe.trimming.TrimmableTestConfigurationFragments.BOptions;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import java.util.Objects;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -459,13 +459,13 @@
       OptionsDiffForReconstruction diffB = BuildOptions.diffForReconstruction(baseB, newB);
 
       IllegalArgumentException forwardException =
-          MoreAsserts.assertThrows(
+          assertThrows(
               IllegalArgumentException.class,
               () -> OptionsDiffForReconstruction.compareFragments(diffA, diffB));
       assertThat(forwardException).hasMessageThat().contains("diffs with different bases");
 
       IllegalArgumentException reverseException =
-          MoreAsserts.assertThrows(
+          assertThrows(
               IllegalArgumentException.class,
               () -> OptionsDiffForReconstruction.compareFragments(diffB, diffA));
       assertThat(reverseException).hasMessageThat().contains("diffs with different bases");

src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
index 2570af9..386d564 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.collect.nestedset;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.HashMultiset;
@@ -21,7 +22,6 @@
 import com.google.devtools.build.lib.actions.CommandLineItem;
 import com.google.devtools.build.lib.actions.CommandLineItem.CapturingMapFn;
 import com.google.devtools.build.lib.actions.CommandLineItem.MapFn;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.util.Fingerprint;
 import java.util.function.Consumer;
 import org.junit.Before;
@@ -149,14 +149,14 @@
     // Make sure a ParametrizedMapFn doesn't get blacklisted until it exceeds its instance count
     cache.addNestedSetToFingerprint(new IntParametrizedMapFn(1), new Fingerprint(), nestedSet);
     cache.addNestedSetToFingerprint(new IntParametrizedMapFn(2), new Fingerprint(), nestedSet);
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () ->
             cache.addNestedSetToFingerprint(
                 new IntParametrizedMapFn(3), new Fingerprint(), nestedSet));
 
     // Make sure a capturing method reference gets blacklisted
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> {
           for (int i = 0; i < 2; ++i) {
@@ -166,7 +166,7 @@
         });
 
     // Do make sure that a capturing lambda gets blacklisted
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> {
           for (int i = 0; i < 2; ++i) {

src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetViewTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetViewTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetViewTest.java
index a19d7af..04054b6 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetViewTest.java
@@ -14,9 +14,9 @@
 package com.google.devtools.build.lib.collect.nestedset;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -142,10 +142,8 @@
   public void testSplitFails() {
     NestedSet<String> a = NestedSetBuilder.<String>stableOrder().add("a").add("b").build();
     NestedSetView<String> v = new NestedSetView<>(a);
-    MoreAsserts.assertThrows(
-        IllegalArgumentException.class, () -> v.splitIfExceedsMaximumSize(-100));
-    MoreAsserts.assertThrows(
-        IllegalArgumentException.class, () -> v.splitIfExceedsMaximumSize(1));
+    assertThrows(IllegalArgumentException.class, () -> v.splitIfExceedsMaximumSize(-100));
+    assertThrows(IllegalArgumentException.class, () -> v.splitIfExceedsMaximumSize(1));
   }
 
   @Test

src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index 6966276..b8ceb4f 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -30,7 +30,6 @@
 import com.google.devtools.build.lib.packages.util.PackageFactoryTestBase;
 import com.google.devtools.build.lib.syntax.BuildFileAST;
 import com.google.devtools.build.lib.syntax.Type;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -805,7 +804,7 @@
     unreadableSubdir.setReadable(false);
 
     Path file = scratch.file("/pkg/BUILD", "cc_library(name = 'c', srcs = glob(['globs/**']))");
-    MoreAsserts.assertThrows(
+    assertThrows(
         NoSuchPackageException.class,
         () -> packages.eval("pkg", RootedPath.toRootedPath(root, file)));
     events.assertContainsError("Directory is not readable");
@@ -999,7 +998,7 @@
     Path parentDir = buildFile.getParentDirectory();
     scratch.file("/e/data.txt");
     throwOnReaddir = parentDir;
-    MoreAsserts.assertThrows(
+    assertThrows(
         NoSuchPackageException.class,
         () -> packages.createPackage("e", RootedPath.toRootedPath(root, buildFile)));
     events.setFailFast(true);

src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagValueTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagValueTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagValueTest.java
index 4ced0bc4..c303c66 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagValueTest.java
@@ -16,6 +16,7 @@
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -23,7 +24,6 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import java.util.Map;
 import java.util.Set;
 import org.junit.Test;
@@ -268,7 +268,7 @@
     final BuildOptions testedOptions = options;
 
     FeatureFlagValue.UnknownValueException unknownValueException =
-        MoreAsserts.assertThrows(
+        assertThrows(
             FeatureFlagValue.UnknownValueException.class,
             () -> FeatureFlagValue.getFlagValues(testedOptions));
     assertThat(unknownValueException.getUnknownFlags())

src/test/java/com/google/devtools/build/lib/skyframe/serialization/ArrayCodecTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ArrayCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ArrayCodecTest.java
index 58bcd4a..6e9989b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ArrayCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ArrayCodecTest.java
@@ -15,11 +15,11 @@
 package com.google.devtools.build.lib.skyframe.serialization;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.TestUtils;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -49,8 +49,7 @@
       cur[0] = new Object[1];
       cur = (Object[]) cur[0];
     }
-    MoreAsserts.assertThrows(
-        SerializationException.class, () -> TestUtils.toBytes(obj, ImmutableMap.of()));
+    assertThrows(SerializationException.class, () -> TestUtils.toBytes(obj, ImmutableMap.of()));
   }
 
   private static void verifyDeserialized(Object[] original, Object[] deserialized) {

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 9ea5f58..30d2b4a 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -3020,7 +3020,7 @@
     }
 
     // Ensure errors are handled
-    MoreAsserts.assertThrows(
+    assertThrows(
         CommandLineExpansionException.class,
         () -> {
           SkylarkCustomCommandLine commandLine =

src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java b/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
index e31b232..1e78a0c 100644
--- a/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
+++ b/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
@@ -14,9 +14,9 @@
 package com.google.devtools.build.lib.unix;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.testing.EqualsTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.vfs.DigestHashFunction;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
@@ -94,8 +94,8 @@
     Path a = unixFs.getPath("/a");
     Path b = otherUnixFs.getPath("/b");
 
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.renameTo(b));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.relativeTo(b));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.createSymbolicLink(b));
+    assertThrows(IllegalArgumentException.class, () -> a.renameTo(b));
+    assertThrows(IllegalArgumentException.class, () -> a.relativeTo(b));
+    assertThrows(IllegalArgumentException.class, () -> a.createSymbolicLink(b));
   }
 }

src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index 3e55ae0..7cd5e70 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -21,7 +21,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.BaseEncoding;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.unix.FileStatus;
 import com.google.devtools.build.lib.unix.NativePosixFiles;
@@ -519,7 +518,7 @@
     path.getParentDirectory().createDirectoryAndParents();
     FileSystemUtils.createEmptyFile(path);
     Path theHierarchy = path.getChild("the-hierarchy");
-    MoreAsserts.assertThrows(IOException.class, theHierarchy::createDirectoryAndParents);
+    assertThrows(IOException.class, theHierarchy::createDirectoryAndParents);
   }
 
   @Test
@@ -551,7 +550,7 @@
   public void testCreateDirectoryAtFileFails() throws Exception {
     Path newPath = absolutize("file");
     FileSystemUtils.createEmptyFile(newPath);
-    MoreAsserts.assertThrows(IOException.class, newPath::createDirectoryAndParents);
+    assertThrows(IOException.class, newPath::createDirectoryAndParents);
   }
 
   @Test
@@ -1153,12 +1152,12 @@
   // Test the Paths
   @Test
   public void testGetPathOnlyAcceptsAbsolutePath() {
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> testFS.getPath("not-absolute"));
+    assertThrows(IllegalArgumentException.class, () -> testFS.getPath("not-absolute"));
   }
 
   @Test
   public void testGetPathOnlyAcceptsAbsolutePathFragment() {
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class, () -> testFS.getPath(PathFragment.create("not-absolute")));
   }
 

src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
index 78986e0..cacab09 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
@@ -15,6 +15,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 import static com.google.devtools.build.lib.vfs.PathFragment.create;
 
 import com.google.common.collect.ImmutableList;
@@ -22,7 +23,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import java.io.File;
@@ -174,12 +174,12 @@
   @Test
   public void testGetChildRejectsInvalidBaseNames() {
     PathFragment pf = create("../some/path");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("."));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild(".."));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("x/y"));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("/y"));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("y/"));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild(""));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild("."));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild(".."));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild("x/y"));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild("/y"));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild("y/"));
+    assertThrows(IllegalArgumentException.class, () -> pf.getChild(""));
   }
 
   @Test
@@ -327,14 +327,10 @@
     assertThat(create("foo/bar/baz").subFragment(2).getPathString()).isEqualTo("baz");
     assertThat(create("foo/bar/baz").subFragment(3).getPathString()).isEqualTo("");
 
-    MoreAsserts.assertThrows(
-        IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
-    MoreAsserts.assertThrows(
-        IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4, 4));
-    MoreAsserts.assertThrows(
-        IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
-    MoreAsserts.assertThrows(
-        IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4));
+    assertThrows(IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
+    assertThrows(IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4, 4));
+    assertThrows(IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
+    assertThrows(IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4));
   }
 
   @Test
@@ -376,12 +372,12 @@
     PathFragment.checkAllPathsAreUnder(ImmutableList.<PathFragment>of(), create("a"));
 
     // Check fails when some path does not start with startingWithPath:
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> PathFragment.checkAllPathsAreUnder(toPathsSet("a/b", "b/c"), create("a")));
 
     // Check fails when some path is equal to startingWithPath:
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class,
         () -> PathFragment.checkAllPathsAreUnder(toPathsSet("a/b", "a"), create("a")));
   }
@@ -427,14 +423,14 @@
   public void testToRelative() {
     assertThat(create("/foo/bar").toRelative()).isEqualTo(create("foo/bar"));
     assertThat(create("/").toRelative()).isEqualTo(create(""));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
+    assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
   }
 
   @Test
   public void testGetDriveStr() {
     assertThat(create("/foo/bar").getDriveStr()).isEqualTo("/");
     assertThat(create("/").getDriveStr()).isEqualTo("/");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
+    assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
   }
 
   static List<PathFragment> toPaths(List<String> strs) {
@@ -560,8 +556,8 @@
     assertThat(create("/a/b").getSegment(1)).isEqualTo("b");
     assertThat(create("/a/b/c").getSegment(2)).isEqualTo("c");
 
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("").getSegment(0));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("a/b").getSegment(2));
+    assertThrows(IllegalArgumentException.class, () -> create("").getSegment(0));
+    assertThrows(IllegalArgumentException.class, () -> create("a/b").getSegment(2));
   }
 
   @Test

src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java

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 e5347a1..3ccdda2 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
@@ -14,9 +14,9 @@
 package com.google.devtools.build.lib.vfs;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 import static com.google.devtools.build.lib.vfs.PathFragment.create;
 
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import java.io.File;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -112,14 +112,14 @@
   @Test
   public void testRelativeTo() throws Exception {
     assertThat(create("").relativeTo("").getPathString()).isEqualTo("");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("").relativeTo("a"));
+    assertThrows(IllegalArgumentException.class, () -> create("").relativeTo("a"));
 
     assertThat(create("a").relativeTo("")).isEqualTo(create("a"));
     assertThat(create("a").relativeTo("a").getPathString()).isEqualTo("");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("a").relativeTo("b"));
+    assertThrows(IllegalArgumentException.class, () -> create("a").relativeTo("b"));
     assertThat(create("a/b").relativeTo("a")).isEqualTo(create("b"));
 
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("C:/").relativeTo(""));
+    assertThrows(IllegalArgumentException.class, () -> create("C:/").relativeTo(""));
     assertThat(create("C:/").relativeTo("C:/").getPathString()).isEqualTo("");
   }
 
@@ -239,13 +239,13 @@
   public void testToRelative() {
     assertThat(create("C:/foo/bar").toRelative()).isEqualTo(create("foo/bar"));
     assertThat(create("C:/").toRelative()).isEqualTo(create(""));
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
+    assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
   }
 
   @Test
   public void testGetDriveStr() {
     assertThat(create("C:/foo/bar").getDriveStr()).isEqualTo("C:/");
     assertThat(create("C:/").getDriveStr()).isEqualTo("C:/");
-    MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
+    assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
   }
 }

src/test/java/com/google/devtools/build/lib/vfs/RootTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
index 640f8c4..6858533 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
@@ -14,12 +14,12 @@
 package com.google.devtools.build.lib.vfs;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.collect.Lists;
 import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import java.util.Comparator;
 import java.util.List;
@@ -62,8 +62,7 @@
     assertThat(root.relativize(fs.getPath("/foo/bar"))).isEqualTo(PathFragment.create("bar"));
     assertThat(root.relativize(PathFragment.create("/foo/bar")))
         .isEqualTo(PathFragment.create("bar"));
-    MoreAsserts.assertThrows(
-        IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
+    assertThrows(IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
   }
 
   @Test
@@ -87,12 +86,11 @@
     assertThat(root.relativize(fs.getPath("/foo"))).isEqualTo(PathFragment.create("/foo"));
     assertThat(root.relativize(PathFragment.create("/foo"))).isEqualTo(PathFragment.create("/foo"));
 
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class, () -> root.getRelative(PathFragment.create("foo")));
-    MoreAsserts.assertThrows(
+    assertThrows(
         IllegalArgumentException.class, () -> root.getRelative(PathFragment.create("foo")));
-    MoreAsserts.assertThrows(
-        IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
+    assertThrows(IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
   }
 
   @Test

src/test/java/com/google/devtools/build/lib/vfs/WindowsPathTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/WindowsPathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/WindowsPathTest.java
index c759219..949afa0 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/WindowsPathTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/WindowsPathTest.java
@@ -14,9 +14,9 @@
 package com.google.devtools.build.lib.vfs;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.common.testing.EqualsTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.vfs.WindowsOsPathPolicy.ShortPathResolver;
 import java.util.HashMap;
 import java.util.Map;
@@ -101,8 +101,7 @@
     assertThat(create("C:/foo").relativeTo(create("C:/")).getPathString()).isEqualTo("foo");
     // Case insensitivity test
     assertThat(create("C:/foo/bar").relativeTo(create("C:/FOO")).getPathString()).isEqualTo("bar");
-    MoreAsserts.assertThrows(
-        IllegalArgumentException.class, () -> create("D:/foo").relativeTo(create("C:/")));
+    assertThrows(IllegalArgumentException.class, () -> create("D:/foo").relativeTo(create("C:/")));
   }
 
   @Test