commit b0c7ee5377fbd310177606e0cd26c602bd1efab4
author jcater <jcater@google.com> Thu May 02 12:33:13 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu May 02 12:34:28 2019 -0700
tree 27efd92f70b535b634c2e3cd149b218fe40dbc84
parent 3488aaa9e0c89da27e7a5f64ec3e248836f665e0

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/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