Automatic cleanup change.

PiperOrigin-RevId: 246021743
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index f20cc1b..153b0ee 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.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.EvaluationResultSubjectFactory.assertThatEvaluationResult;
 import static org.junit.Assert.fail;
 
@@ -625,11 +626,7 @@
     PackageValue value = validPackage(skyKey);
     assertThat(value.getPackage().containsErrors()).isFalse();
     assertThat(value.getPackage().getTarget("existing.txt").getName()).isEqualTo("existing.txt");
-    try {
-      value.getPackage().getTarget("dangling.txt");
-      fail();
-    } catch (NoSuchTargetException expected) {
-    }
+    assertThrows(NoSuchTargetException.class, () -> value.getPackage().getTarget("dangling.txt"));
 
     scratch.overwriteFile(
         "foo/BUILD", "exports_files(glob(['*.txt']))", "#some-irrelevant-comment");
@@ -640,17 +637,13 @@
             ModifiedFileSet.builder().modify(PathFragment.create("foo/BUILD")).build(),
             Root.fromPath(rootDirectory));
 
-    value = validPackage(skyKey);
-    assertThat(value.getPackage().containsErrors()).isFalse();
-    assertThat(value.getPackage().getTarget("existing.txt").getName()).isEqualTo("existing.txt");
-    try {
-      value.getPackage().getTarget("dangling.txt");
-      fail();
-    } catch (NoSuchTargetException expected) {
-      // One consequence of the bug was that dangling symlinks were matched by globs evaluated by
-      // Skyframe globbing, meaning there would incorrectly be corresponding targets in packages
-      // that had skyframe cache hits during skyframe hybrid globbing.
-    }
+    PackageValue value2 = validPackage(skyKey);
+    assertThat(value2.getPackage().containsErrors()).isFalse();
+    assertThat(value2.getPackage().getTarget("existing.txt").getName()).isEqualTo("existing.txt");
+    assertThrows(NoSuchTargetException.class, () -> value2.getPackage().getTarget("dangling.txt"));
+    // One consequence of the bug was that dangling symlinks were matched by globs evaluated by
+    // Skyframe globbing, meaning there would incorrectly be corresponding targets in packages
+    // that had skyframe cache hits during skyframe hybrid globbing.
 
     scratch.file("foo/nope");
     getSkyframeExecutor()
@@ -684,11 +677,7 @@
     PackageValue value = validPackage(skyKey);
     assertThat(value.getPackage().containsErrors()).isFalse();
     assertThat(value.getPackage().getTarget("bar-matched").getName()).isEqualTo("bar-matched");
-    try {
-      value.getPackage().getTarget("-matched");
-      fail();
-    } catch (NoSuchTargetException expected) {
-    }
+    assertThrows(NoSuchTargetException.class, () -> value.getPackage().getTarget("-matched"));
 
     scratch.overwriteFile(
         "foo/BUILD",
@@ -700,14 +689,10 @@
             ModifiedFileSet.builder().modify(PathFragment.create("foo/BUILD")).build(),
             Root.fromPath(rootDirectory));
 
-    value = validPackage(skyKey);
-    assertThat(value.getPackage().containsErrors()).isFalse();
-    assertThat(value.getPackage().getTarget("bar-matched").getName()).isEqualTo("bar-matched");
-    try {
-      value.getPackage().getTarget("-matched");
-      fail();
-    } catch (NoSuchTargetException expected) {
-    }
+    PackageValue value2 = validPackage(skyKey);
+    assertThat(value2.getPackage().containsErrors()).isFalse();
+    assertThat(value2.getPackage().getTarget("bar-matched").getName()).isEqualTo("bar-matched");
+    assertThrows(NoSuchTargetException.class, () -> value2.getPackage().getTarget("-matched"));
   }
 
   @Test