Replace MoreAsserts.assertThrows with Assert.assertThrows
Generated using grep, sed, some magic, and then some manual cleanup.
PiperOrigin-RevId: 303378893
diff --git a/src/test/java/com/google/devtools/build/android/BUILD b/src/test/java/com/google/devtools/build/android/BUILD
index f703692..075259b 100644
--- a/src/test/java/com/google/devtools/build/android/BUILD
+++ b/src/test/java/com/google/devtools/build/android/BUILD
@@ -202,8 +202,6 @@
size = "small",
srcs = ["DensitySpecificManifestProcessorTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -217,8 +215,6 @@
size = "small",
srcs = ["DensitySpecificResourceFilterTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:junit4",
@@ -231,8 +227,6 @@
size = "small",
srcs = ["DependencyAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -264,8 +258,6 @@
srcs = ["ParsedAndroidDataTest.java"],
deps = [
":test_utils",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/android/java/com/google/devtools/build/android/resources",
"//third_party:android_common_25_0_0",
@@ -296,8 +288,6 @@
size = "small",
srcs = ["SerializedAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -311,8 +301,6 @@
size = "small",
srcs = ["UnvalidatedAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
diff --git a/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java b/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
index 30bc5b0..b6b8105 100644
--- a/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
+++ b/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
@@ -16,7 +16,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.android.DensitySpecificManifestProcessor.PLAY_STORE_SUPPORTED_DENSITIES;
import static com.google.devtools.build.android.DensitySpecificManifestProcessor.SCREEN_SIZES;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
diff --git a/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java b/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
index 24ad9e4..f5bbc33 100644
--- a/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
+++ b/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android;
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.Lists;
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 33c7495..278ba84 100644
--- a/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/DependencyAndroidDataTest.java
@@ -13,7 +13,7 @@
// limitations under the License.
package com.google.devtools.build.android;
-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.jimfs.Jimfs;
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 b03ba57..5b8fe3e 100644
--- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android;
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.base.Joiner;
import com.google.common.collect.ImmutableList;
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 9890096..c63c253 100644
--- a/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/SerializedAndroidDataTest.java
@@ -13,7 +13,7 @@
// limitations under the License.
package com.google.devtools.build.android;
-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.jimfs.Jimfs;
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 d8977ec..175e614 100644
--- a/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java
+++ b/src/test/java/com/google/devtools/build/android/UnvalidatedAndroidDataTest.java
@@ -13,7 +13,7 @@
// limitations under the License.
package com.google.devtools.build.android;
-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.jimfs.Jimfs;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD
index 590f41e..55c1831 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD
@@ -46,8 +46,6 @@
tags = ["no_windows"],
deps = [
":testdata_desugared", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -66,8 +64,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_twice", # Make tests run against twice-desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -103,8 +99,6 @@
deps = [
":desugar_testdata_with_synthetic_methods_with_lambda_names",
":separate",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -139,8 +133,6 @@
tags = ["no_windows"],
deps = [
":testdata_desugared", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -157,8 +149,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarObjectsRequireNonNullTest",
deps = [
":desugar_testdata_by_disabling_lambda_desugaring", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -177,8 +167,6 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_java8", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -197,8 +185,6 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_java8_like_in_android_studio", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -217,8 +203,6 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_default_methods", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -238,8 +222,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarDefaultMethodsFunctionalTest",
deps = [
":testdata_desugared_default_methods_twice", # Make tests run against 2x desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -257,8 +239,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_like_in_android_studio", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -276,8 +256,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_with_multiple_inputs", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -295,8 +273,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_from_directory_to_jar", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -314,8 +290,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_from_directory_to_directory", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -333,8 +307,6 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_with_classpath_directory", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -431,8 +403,6 @@
size = "small",
srcs = ["Java7CompatibilityTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//third_party:asm",
@@ -457,8 +427,6 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -485,8 +453,6 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -514,8 +480,6 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -536,8 +500,6 @@
tags = ["no_windows"],
test_class = "com.google.devtools.build.android.desugar.DesugarMainClassTest",
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//third_party:guava",
"//third_party:junit4",
@@ -554,8 +516,6 @@
tags = ["no_windows"],
test_class = "com.google.devtools.build.android.desugar.DesugarMainClassTest",
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//third_party:guava",
"//third_party:junit4",
@@ -997,8 +957,6 @@
"mocked_android_os_sdk_for_testing",
":desugar_testdata_by_desugaring_try_with_resources",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1023,8 +981,6 @@
"mocked_android_os_sdk_for_testing",
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1048,8 +1004,6 @@
":desugar_testdata_by_desugaring_try_with_resources",
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1073,8 +1027,6 @@
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice.
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1098,8 +1050,6 @@
":desugar_testdata_by_desugaring_try_with_resources",
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1123,8 +1073,6 @@
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice.
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/DesugarFunctionalTest.java b/src/test/java/com/google/devtools/build/android/desugar/DesugarFunctionalTest.java
index 20a86b9..d34fb94 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/DesugarFunctionalTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/DesugarFunctionalTest.java
@@ -15,9 +15,9 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.lang.reflect.Modifier.isFinal;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/DesugarJava8FunctionalTest.java b/src/test/java/com/google/devtools/build/android/desugar/DesugarJava8FunctionalTest.java
index 75d4f43..e288081 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/DesugarJava8FunctionalTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/DesugarJava8FunctionalTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.desugar;
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.devtools.build.android.desugar.testdata.java8.AnnotationsOfDefaultMethodsShouldBeKept.AnnotatedInterface;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/DesugarMainClassTest.java b/src/test/java/com/google/devtools/build/android/desugar/DesugarMainClassTest.java
index 8e5e2ba..ef7fcfb 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/DesugarMainClassTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/DesugarMainClassTest.java
@@ -15,7 +15,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.android.desugar.LambdaClassMaker.LAMBDA_METAFACTORY_DUMPER_PROPERTY;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import com.google.common.base.Strings;
import java.io.IOError;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/DesugarObjectsRequireNonNullTest.java b/src/test/java/com/google/devtools/build/android/desugar/DesugarObjectsRequireNonNullTest.java
index 6ac3563..37dbba2 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/DesugarObjectsRequireNonNullTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/DesugarObjectsRequireNonNullTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.desugar;
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 static org.junit.Assert.fail;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/DesugarTryWithResourcesFunctionalTest.java b/src/test/java/com/google/devtools/build/android/desugar/DesugarTryWithResourcesFunctionalTest.java
index 90d4215..41eb2e0 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/DesugarTryWithResourcesFunctionalTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/DesugarTryWithResourcesFunctionalTest.java
@@ -19,7 +19,7 @@
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isMimicStrategy;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isNullStrategy;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isReuseStrategy;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.devtools.build.android.desugar.runtime.ThrowableExtension;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/Java7CompatibilityTest.java b/src/test/java/com/google/devtools/build/android/desugar/Java7CompatibilityTest.java
index df5a1d4..15bc853 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/Java7CompatibilityTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/Java7CompatibilityTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.desugar;
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.devtools.build.android.desugar.io.BitFlags;
import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriterTest.java b/src/test/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriterTest.java
index 00f5d56..8fbb5de 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriterTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriterTest.java
@@ -19,7 +19,7 @@
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isMimicStrategy;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isNullStrategy;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isReuseStrategy;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
import static org.objectweb.asm.Opcodes.ASM5;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
index 91712b5..d589693 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
@@ -36,8 +36,6 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
@@ -58,8 +56,6 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
@@ -79,8 +75,6 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTest.java b/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTest.java
index 5ac88b8..5ab13ed 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTest.java
@@ -17,8 +17,8 @@
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtension.MimicDesugaringStrategy.SUPPRESSED_PREFIX;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.getTwrStrategyClassNameSpecifiedInSystemProperty;
import static com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTestUtility.isNullStrategy;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.devtools.build.android.desugar.runtime.ThrowableExtension.MimicDesugaringStrategy;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
index 4c564ab..cf8f2ca 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
@@ -27,8 +27,6 @@
"-Djacoco_agent_jar=$(location //src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:jacoco_agent_jar)",
],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:desugar_rule",
"//third_party:asm",
"//third_party:asm-tree",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRuleTest.java b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRuleTest.java
index 7f4355a..517e472 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRuleTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRuleTest.java
@@ -18,7 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import com.google.devtools.build.android.desugar.testing.junit.RuntimeMethodHandle.MemberUseContext;
import java.lang.invoke.MethodHandle;
diff --git a/src/test/java/com/google/devtools/build/android/xml/BUILD b/src/test/java/com/google/devtools/build/android/xml/BUILD
index d160a0c..7c9eb55 100644
--- a/src/test/java/com/google/devtools/build/android/xml/BUILD
+++ b/src/test/java/com/google/devtools/build/android/xml/BUILD
@@ -12,8 +12,6 @@
size = "small",
srcs = ["IdXmlResourceValueTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/android/java/com/google/devtools/build/android/proto:resources_java_proto",
"//src/tools/android/java/com/google/devtools/build/android/resources",
diff --git a/src/test/java/com/google/devtools/build/android/xml/IdXmlResourceValueTest.java b/src/test/java/com/google/devtools/build/android/xml/IdXmlResourceValueTest.java
index 82183a7..2b4aeaf 100644
--- a/src/test/java/com/google/devtools/build/android/xml/IdXmlResourceValueTest.java
+++ b/src/test/java/com/google/devtools/build/android/xml/IdXmlResourceValueTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.xml;
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.android.aapt.Resources.Item;
import com.android.aapt.Resources.Reference;
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/BUILD b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
index 3e31386..701fcf7 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
@@ -19,8 +19,6 @@
tags = ["ziputils"],
test_class = "com.google.devtools.build.android.ziputils.AllTests",
deps = [
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//src/tools/android/java/com/google/devtools/build/android/ziputils:ziputils_lib",
"//third_party:guava",
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/BufferedFileTest.java b/src/test/java/com/google/devtools/build/android/ziputils/BufferedFileTest.java
index ddb4e13..75ee0d0 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/BufferedFileTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/BufferedFileTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.ziputils;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
index b23cb49..20906c5 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.ziputils;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/SplitZipTest.java b/src/test/java/com/google/devtools/build/android/ziputils/SplitZipTest.java
index f9f6e46..360d900 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/SplitZipTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/SplitZipTest.java
@@ -15,7 +15,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.base.Predicates;
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
index 01e4bcd..186c485 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
@@ -14,8 +14,8 @@
package com.google.devtools.build.android.ziputils;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java
index c0426de..15335b6 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java
@@ -24,8 +24,8 @@
import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDSIZ;
import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDSUB;
import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDTOT;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import com.google.devtools.build.android.ziputils.ZipIn.ZipEntry;
import java.io.IOException;
diff --git a/src/test/java/com/google/devtools/build/docgen/BUILD b/src/test/java/com/google/devtools/build/docgen/BUILD
index eb696e5..b9a7f0d 100644
--- a/src/test/java/com/google/devtools/build/docgen/BUILD
+++ b/src/test/java/com/google/devtools/build/docgen/BUILD
@@ -54,8 +54,6 @@
"//src/main/java/com/google/devtools/build/lib/skylarkinterface",
"//src/test/java/com/google/devtools/build/lib/skylark/util",
"//src/test/java/com/google/devtools/build/lib/syntax/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
index 72642e9..05f33bc 100644
--- a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.docgen;
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.devtools.build.lib.skylarkinterface.SkylarkCallable;
diff --git a/src/test/java/com/google/devtools/build/skydoc/BUILD b/src/test/java/com/google/devtools/build/skydoc/BUILD
index 4c82a2d..e7899bc 100644
--- a/src/test/java/com/google/devtools/build/skydoc/BUILD
+++ b/src/test/java/com/google/devtools/build/skydoc/BUILD
@@ -29,8 +29,6 @@
"//src/main/java/com/google/devtools/build/skydoc/rendering",
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto",
"//src/test/java/com/google/devtools/build/lib/skylark/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
index fdb1b6c..a6ab2c2 100644
--- a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
+++ b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.skydoc;
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/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD
index 19c4a44..2f5ec2a 100644
--- a/src/test/java/com/google/devtools/build/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/skyframe/BUILD
@@ -61,7 +61,6 @@
"//src/main/java/com/google/devtools/build/skyframe:graph_inconsistency_java_proto",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/test/java/com/google/devtools/build/lib/testutil:EventUtils",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/test/java/com/google/devtools/build/lib/testutil:TestRunnableWrapper",
"//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//src/test/java/com/google/devtools/build/lib/testutil:TestThread",
diff --git a/src/test/java/com/google/devtools/build/skyframe/CycleDeduperTest.java b/src/test/java/com/google/devtools/build/skyframe/CycleDeduperTest.java
index 28f8065..545dc0e 100644
--- a/src/test/java/com/google/devtools/build/skyframe/CycleDeduperTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/CycleDeduperTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skyframe;
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 org.junit.Test;
diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
index aaf5db5..6d37fcc 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
@@ -14,9 +14,9 @@
package com.google.devtools.build.skyframe;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
import static com.google.devtools.build.skyframe.GraphTester.NODE_TYPE;
+import static org.junit.Assert.assertThrows;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
diff --git a/src/test/java/com/google/devtools/build/skyframe/EmptySkyValueTest.java b/src/test/java/com/google/devtools/build/skyframe/EmptySkyValueTest.java
index 7ec95b0..7c5067a 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EmptySkyValueTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EmptySkyValueTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skyframe;
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 java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
index e1fdba5..7dc4f91 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skyframe;
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.Iterables;
diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java b/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
index 1ae1185..6d9ed13 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skyframe;
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 java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
index 9deed82..3f287b6 100644
--- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
@@ -15,8 +15,8 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static com.google.devtools.build.skyframe.NodeEntrySubjectFactory.assertThatNodeEntry;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
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 5c5bdb3..7681d03 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -16,13 +16,13 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.devtools.build.lib.testutil.EventIterableSubjectFactory.assertThatEvents;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static com.google.devtools.build.skyframe.ErrorInfoSubjectFactory.assertThatErrorInfo;
import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory.assertThatEvaluationResult;
import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
import static com.google.devtools.build.skyframe.GraphTester.COPY;
import static com.google.devtools.build.skyframe.GraphTester.NODE_TYPE;
import static com.google.devtools.build.skyframe.GraphTester.skyKey;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.auto.value.AutoValue;
diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
index 0f7a8bf..a9ad0ab 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -17,9 +17,9 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.devtools.build.lib.testutil.EventIterableSubjectFactory.assertThatEvents;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory.assertThatEvaluationResult;
import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.base.Preconditions;
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 7d3ffd9..8aed682 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skyframe;
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.Interner;
diff --git a/src/test/java/com/google/devtools/common/options/AssignmentConverterTest.java b/src/test/java/com/google/devtools/common/options/AssignmentConverterTest.java
index 4c044f5..b91bec0 100644
--- a/src/test/java/com/google/devtools/common/options/AssignmentConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/AssignmentConverterTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options;
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.Maps;
import java.util.Map;
diff --git a/src/test/java/com/google/devtools/common/options/BUILD b/src/test/java/com/google/devtools/common/options/BUILD
index 9db1ae3..5bc33a4 100644
--- a/src/test/java/com/google/devtools/common/options/BUILD
+++ b/src/test/java/com/google/devtools/common/options/BUILD
@@ -47,7 +47,6 @@
"//src/main/java/com/google/devtools/common/options/testing",
"//src/main/protobuf:invocation_policy_java_proto",
"//src/main/protobuf:option_filters_java_proto",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//third_party:flogger",
"//third_party:guava",
diff --git a/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java b/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java
index ff92faa..22900e9 100644
--- a/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options;
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;
diff --git a/src/test/java/com/google/devtools/common/options/CommaSeparatedOptionListConverterTest.java b/src/test/java/com/google/devtools/common/options/CommaSeparatedOptionListConverterTest.java
index f8b9193..25651ec 100644
--- a/src/test/java/com/google/devtools/common/options/CommaSeparatedOptionListConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/CommaSeparatedOptionListConverterTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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 java.util.List;
import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/common/options/DurationConverterTest.java b/src/test/java/com/google/devtools/common/options/DurationConverterTest.java
index 264bbff..dc0e6fd 100644
--- a/src/test/java/com/google/devtools/common/options/DurationConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/DurationConverterTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.common.options.Converters.DurationConverter;
import java.time.Duration;
diff --git a/src/test/java/com/google/devtools/common/options/EnumConverterTest.java b/src/test/java/com/google/devtools/common/options/EnumConverterTest.java
index 12391c4..6f00afb 100644
--- a/src/test/java/com/google/devtools/common/options/EnumConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/EnumConverterTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options;
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 java.util.List;
import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/common/options/InvocationPolicyAllowValuesTest.java b/src/test/java/com/google/devtools/common/options/InvocationPolicyAllowValuesTest.java
index 72b9511..1b073e1 100644
--- a/src/test/java/com/google/devtools/common/options/InvocationPolicyAllowValuesTest.java
+++ b/src/test/java/com/google/devtools/common/options/InvocationPolicyAllowValuesTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.AllowValues;
import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
diff --git a/src/test/java/com/google/devtools/common/options/InvocationPolicyDisallowValuesTest.java b/src/test/java/com/google/devtools/common/options/InvocationPolicyDisallowValuesTest.java
index 088c140..85aa06f 100644
--- a/src/test/java/com/google/devtools/common/options/InvocationPolicyDisallowValuesTest.java
+++ b/src/test/java/com/google/devtools/common/options/InvocationPolicyDisallowValuesTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.DisallowValues;
import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
diff --git a/src/test/java/com/google/devtools/common/options/InvocationPolicySetValueTest.java b/src/test/java/com/google/devtools/common/options/InvocationPolicySetValueTest.java
index e08efa6..5f2366c 100644
--- a/src/test/java/com/google/devtools/common/options/InvocationPolicySetValueTest.java
+++ b/src/test/java/com/google/devtools/common/options/InvocationPolicySetValueTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/common/options/LogLevelConverterTest.java b/src/test/java/com/google/devtools/common/options/LogLevelConverterTest.java
index 86a8fde..8162ef3 100644
--- a/src/test/java/com/google/devtools/common/options/LogLevelConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/LogLevelConverterTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.common.options.Converters.LogLevelConverter;
import java.util.logging.Level;
diff --git a/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java b/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java
index 75f77b5..16cfeff 100644
--- a/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options;
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 static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
index 9ab340e..82afa98 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options;
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.truth.Correspondence;
diff --git a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
index 01e2baa..90f2bb6 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
@@ -15,8 +15,8 @@
package com.google.devtools.common.options;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.util.Arrays.asList;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
diff --git a/src/test/java/com/google/devtools/common/options/OptionsTest.java b/src/test/java/com/google/devtools/common/options/OptionsTest.java
index 03dacf4..a169807 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsTest.java
@@ -15,8 +15,8 @@
package com.google.devtools.common.options;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static java.util.Arrays.asList;
+import static org.junit.Assert.assertThrows;
import com.google.common.testing.EqualsTester;
import java.net.MalformedURLException;
diff --git a/src/test/java/com/google/devtools/common/options/ParamsFilePreProcessorTest.java b/src/test/java/com/google/devtools/common/options/ParamsFilePreProcessorTest.java
index 8274c21..700c34f 100644
--- a/src/test/java/com/google/devtools/common/options/ParamsFilePreProcessorTest.java
+++ b/src/test/java/com/google/devtools/common/options/ParamsFilePreProcessorTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.jimfs.Jimfs;
diff --git a/src/test/java/com/google/devtools/common/options/PercentageConverterTest.java b/src/test/java/com/google/devtools/common/options/PercentageConverterTest.java
index 8d5d07b..3983300 100644
--- a/src/test/java/com/google/devtools/common/options/PercentageConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/PercentageConverterTest.java
@@ -15,8 +15,8 @@
package com.google.devtools.common.options;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
import com.google.devtools.common.options.Converters.PercentageConverter;
import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/common/options/RegexPatternConverterTest.java b/src/test/java/com/google/devtools/common/options/RegexPatternConverterTest.java
index f5be9c2..20e7d9d 100644
--- a/src/test/java/com/google/devtools/common/options/RegexPatternConverterTest.java
+++ b/src/test/java/com/google/devtools/common/options/RegexPatternConverterTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.devtools.common.options.Converters.RegexPatternConverter;
import com.google.devtools.common.options.testing.ConverterTester;
diff --git a/src/test/java/com/google/devtools/common/options/ShellQuotedParamsFilePreProcessorTest.java b/src/test/java/com/google/devtools/common/options/ShellQuotedParamsFilePreProcessorTest.java
index 61786f9..d9aed48 100644
--- a/src/test/java/com/google/devtools/common/options/ShellQuotedParamsFilePreProcessorTest.java
+++ b/src/test/java/com/google/devtools/common/options/ShellQuotedParamsFilePreProcessorTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.common.options;
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.jimfs.Jimfs;
diff --git a/src/test/java/com/google/devtools/common/options/testing/BUILD b/src/test/java/com/google/devtools/common/options/testing/BUILD
index f0608a2..618cf4e 100644
--- a/src/test/java/com/google/devtools/common/options/testing/BUILD
+++ b/src/test/java/com/google/devtools/common/options/testing/BUILD
@@ -22,7 +22,6 @@
deps = [
"//src/main/java/com/google/devtools/common/options",
"//src/main/java/com/google/devtools/common/options/testing",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/common/options/testing/ConverterTesterMapTest.java b/src/test/java/com/google/devtools/common/options/testing/ConverterTesterMapTest.java
index a6f5c08..61a6373 100644
--- a/src/test/java/com/google/devtools/common/options/testing/ConverterTesterMapTest.java
+++ b/src/test/java/com/google/devtools/common/options/testing/ConverterTesterMapTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.common.options.testing;
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.devtools.common.options.Converters;
