commit 99b7efbb14d70afc0a0ddc224541af03e18d8be7
author michajlo <michajlo@google.com> Thu Mar 26 15:46:26 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 26 15:47:38 2020 -0700
tree ad7482af9b096ca00378fd4f81bd9c59e7e5932a
parent 4677c11bf2021d7f235d8d18929f20e1b191d304

Replace MoreAsserts.assertThrows with Assert.assertThrows

We're now using a junit version that supports it.

PiperOrigin-RevId: 303209907

tools/java/runfiles/testing/BUILD

diff --git a/tools/java/runfiles/testing/BUILD b/tools/java/runfiles/testing/BUILD
index 2f8e988..6d6b6a1 100644
--- a/tools/java/runfiles/testing/BUILD
+++ b/tools/java/runfiles/testing/BUILD
@@ -20,8 +20,6 @@
     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 @@
     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",
     ],
 )
 

tools/java/runfiles/testing/RunfilesTest.java

diff --git a/tools/java/runfiles/testing/RunfilesTest.java b/tools/java/runfiles/testing/RunfilesTest.java
index 33d324a..fbc8bf8 100644
--- 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;

tools/java/runfiles/testing/UtilTest.java

diff --git a/tools/java/runfiles/testing/UtilTest.java b/tools/java/runfiles/testing/UtilTest.java
index 2bdd4d1..f9c69e1 100644
--- 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;