Replace MoreAsserts.assertThrows with Assert.assertThrows

We're now using a junit version that supports it. PiperOrigin-RevId: 303209907
bazelbuild · Mar 26, 2020 · 99b7efb · 99b7efb
1 parent 4677c11
commit 99b7efb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/tools/java/runfiles/testing/BUILD b/tools/java/runfiles/testing/BUILD
@@ -20,8 +20,6 @@ java_test(
     test_class = "com.google.devtools.build.runfiles.RunfilesTest",
     deps = [
         ":test_deps",
-        "//src/test/java/com/google/devtools/build/lib/testutil",
-        "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
     ],
 )
 
@@ -31,8 +29,6 @@ java_test(
     test_class = "com.google.devtools.build.runfiles.UtilTest",
     deps = [
         ":test_deps",
-        "//src/test/java/com/google/devtools/build/lib/testutil",
-        "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
     ],
 )
 

diff --git a/tools/java/runfiles/testing/RunfilesTest.java b/tools/java/runfiles/testing/RunfilesTest.java
@@ -15,7 +15,7 @@
 package com.google.devtools.build.runfiles;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

diff --git a/tools/java/runfiles/testing/UtilTest.java b/tools/java/runfiles/testing/UtilTest.java
@@ -15,7 +15,7 @@
 package com.google.devtools.build.runfiles;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;