expectThrows has been renamed to assertThrows

More information: https://github.com/junit-team/junit5/issues/531

PiperOrigin-RevId: 186900384

2 files changed, 12 insertions, 29 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
index 3cd9099b41..36f8911fdf 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
@@ -15,7 +15,7 @@
 package com.google.devtools.build.lib.syntax;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
@@ -100,9 +100,7 @@ public class EnvironmentTest extends EvaluationTestCase {
   public void testBuilderRequiresSemantics() throws Exception {
     try (Mutability mut = Mutability.create("test")) {
       IllegalArgumentException expected =
-          expectThrows(
-              IllegalArgumentException.class,
-              () -> Environment.builder(mut).build());
+          assertThrows(IllegalArgumentException.class, () -> Environment.builder(mut).build());
       assertThat(expected).hasMessageThat()
           .contains("must call either setSemantics or useDefaultSemantics");
     }
@@ -366,9 +364,7 @@ public class EnvironmentTest extends EvaluationTestCase {
   private static void assertCheckStateFailsWithMessage(
       Extension left, Object right, String substring) {
     IllegalStateException expected =
-        expectThrows(
-            IllegalStateException.class,
-            () -> left.checkStateEquals(right));
+        assertThrows(IllegalStateException.class, () -> left.checkStateEquals(right));
     assertThat(expected).hasMessageThat().contains(substring);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
index 63438cd5ef..67c3e0ec8b 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
@@ -15,7 +15,7 @@
 package com.google.devtools.build.lib.syntax;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.Mutability.Freezable;
@@ -45,9 +45,7 @@ public final class MutabilityTest {
 
   private void assertCheckMutableFailsBecauseFrozen(Freezable value, Mutability mutability) {
     MutabilityException expected =
-        expectThrows(
-            MutabilityException.class,
-            () -> Mutability.checkMutable(value, mutability));
+        assertThrows(MutabilityException.class, () -> Mutability.checkMutable(value, mutability));
     assertThat(expected).hasMessageThat().contains("trying to mutate a frozen object");
   }
 
@@ -150,9 +148,7 @@ public final class MutabilityTest {
     mutability.lock(dummy, locA);
     mutability.lock(dummy, locB);
     MutabilityException expected =
-        expectThrows(
-            MutabilityException.class,
-            () -> Mutability.checkMutable(dummy, mutability));
+        assertThrows(MutabilityException.class, () -> Mutability.checkMutable(dummy, mutability));
     assertThat(expected).hasMessageThat().contains(
         "trying to mutate a locked object (is it currently being iterated over by a for loop or "
             + "comprehension?)\nObject locked at the following location(s): /a:1, /b:1");
@@ -167,9 +163,7 @@ public final class MutabilityTest {
 
     mutability.lock(dummy, locA);
     IllegalArgumentException expected =
-        expectThrows(
-            IllegalArgumentException.class,
-            () -> mutability.unlock(dummy, locB));
+        assertThrows(IllegalArgumentException.class, () -> mutability.unlock(dummy, locB));
     assertThat(expected).hasMessageThat().contains(
         "trying to unlock an object for a location at which it was not locked (/b:1)");
   }
@@ -194,9 +188,8 @@ public final class MutabilityTest {
     DummyFreezable dummy = new DummyFreezable(mutability1);
 
     IllegalArgumentException expected =
-        expectThrows(
-            IllegalArgumentException.class,
-            () -> Mutability.checkMutable(dummy, mutability2));
+        assertThrows(
+            IllegalArgumentException.class, () -> Mutability.checkMutable(dummy, mutability2));
     assertThat(expected).hasMessageThat().contains(
         "trying to mutate an object from a different context");
   }
@@ -209,9 +202,7 @@ public final class MutabilityTest {
     Location loc = Location.fromPathFragment(PathFragment.create("/a"));
 
     IllegalArgumentException expected =
-        expectThrows(
-            IllegalArgumentException.class,
-            () -> mutability2.lock(dummy, loc));
+        assertThrows(IllegalArgumentException.class, () -> mutability2.lock(dummy, loc));
     assertThat(expected).hasMessageThat().contains(
         "trying to lock an object from a different context");
   }
@@ -224,9 +215,7 @@ public final class MutabilityTest {
     Location loc = Location.fromPathFragment(PathFragment.create("/a"));
 
     IllegalArgumentException expected =
-        expectThrows(
-            IllegalArgumentException.class,
-            () -> mutability2.unlock(dummy, loc));
+        assertThrows(IllegalArgumentException.class, () -> mutability2.unlock(dummy, loc));
     assertThat(expected).hasMessageThat().contains(
         "trying to unlock an object from a different context");
   }
@@ -240,9 +229,7 @@ public final class MutabilityTest {
 
     mutability1.lock(dummy, loc);
     IllegalArgumentException expected =
-        expectThrows(
-            IllegalArgumentException.class,
-            () -> mutability2.isLocked(dummy));
+        assertThrows(IllegalArgumentException.class, () -> mutability2.isLocked(dummy));
     assertThat(expected).hasMessageThat().contains(
         "trying to check the lock of an object from a different context");
   }